Skip to contentSkip to conversation

denzil pull request 4

PATCH Applied Scott Garman 2 participants 8 messages Jun 20, 2012 – Jun 21, 2012

lore
Share & tools
lore

Scott Garman

author
#0 lore raw

cover denzil pull request 4

Hello,

This is the fourth pull request for the oe-core denzil branch, based on a set of commits I've been testing from my sgarman/denzil-next branch. At the time I'm composing this, my previous pull request hasn't been merged yet, so I created this pull against my previous branch, sgarman/denzil-next-pull3.

Once this branch gets merged, we will generate the first denzil release candidate, which will undergo a full QA pass.

These commits have undergone the following testing on the autobuilder:

nightly:
http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/521

nightly-multilib:
http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/117

nightly-non-gpl3:
http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/118

nightly-tiny:
http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/100

nightly-meta-intel (still finishing):
http://autobuilder.yoctoproject.org:8010/builders/nightly-meta-intel/builds/107

I'll note these tests were done with the poky-based tree.

Scott

The following changes since commit eedf8f8d9a7324b33dec71a5c52f8d980dc78752:

eglibc: added ac_cv_path_ to CACHED_CONFIGUREVARS (2012-06-15 09:40:13 -0700)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib sgarman/denzil-next-testing
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/denzil-next-pull4

Anders Darander (1):
qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGS

Bruce Ashfield (5):
linux-yocto/3.2: configuration and pch merge
linux-yocto: intel BSP config changes
linux-yocto: policy cleanups
linux-yocto/3.2: update to v3.2.18
linux-yocto/3.0: update to v3.0.32

 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb   |    6 +++---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb      |   16 ++++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |   18 +++++++++---------
 meta/recipes-qt/qt4/qt4-embedded.inc              |    2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/6 linux-yocto/3.2: configuration and pch merge

From: Bruce Ashfield <[email protected]>

Updating the 3.2 SRCREVs to import the following meta/config changes:

6b3d4e0 meta: add mei feature
519abac meta: add usb/uhci-hcd feature
a67c5a3 meta/crownbay: use usb features
0855066 meta: add usb/ohci-hcd feature
15f1a99 meta: add usb/ehci-hcd feature
8fa6408 meta: add usb/xhci-hcd feature
c724a55 meta: add usb/base feature
b55b3a1 sys940x: Cleanup sys940x.scc
93f2e97 sys940x: Use PHYSICAL_START of 0x200000 to boot aaa034b sys940x: Add common standard and preempt-rt features e2b1286 sys940x: Add efi-ext to standard and preempt-rt configs d188c21 sys940x: Move emgd-1.10 data to the standard scc file 72d9369 fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc dbcb120 fri2: Use emgd-1.10 feature and branch

And the following driver fix:

f39a0a9 pch_gbe: Do not abort probe on bad MAC

Signed-off-by Darren Hart <[email protected]>
Signed-off-by Tom Zanussi <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |   14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +3 -3
index 05674ef..7e01efb 100644
@@ -14,9 +14,9 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
 LINUX_VERSION ?= "3.2.11"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "32ecb53e9ff759bbd297a10712b62a6575daaf86"
-SRCREV_machine_qemuppc ?= "0d5625bb868cc2471d5dd49eb7abe7eb5fe1044b"
-SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d"
+SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7"
+SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c"
+SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +2 -2
index 4957e33..27de229 100644
@@ -11,8 +11,8 @@ KCONFIG_MODE = "--allnoconfig"
 
 LINUX_VERSION ?= "3.2.11"
 
-SRCREV_machine ?= "ec236058dc254183dbfb3744bf21f110c37af30b"
-SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d"
+SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246"
+SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +7 -7
index d81f6b5..51119bb 100644
@@ -17,13 +17,13 @@ KBRANCH_qemuarm  = "standard/default/arm-versatile-926ejs"
 
 LINUX_VERSION ?= "3.2.11"
 
-SRCREV_machine_qemuarm ?= "dfbba772cbee84125ac1558c904a7dc181445f5f"
-SRCREV_machine_qemumips ?= "0e0c67635b74199d534f75500e5c1654a1219bc6"
-SRCREV_machine_qemuppc ?= "92de4e2f3c6b397c8b363e079cc4d5e9bcadf877"
-SRCREV_machine_qemux86 ?= "8ada1bb97415fe959a57a08504be4eb8a656ed30"
-SRCREV_machine_qemux86-64 ?= "4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8"
-SRCREV_machine ?= "01e948c2bdf7f5ad9f2b30047a8d3493a1a2880a"
-SRCREV_meta ?= "b14a08f5c7b469a5077c10942f4e1aec171faa9d"
+SRCREV_machine_qemuarm ?= "ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e"
+SRCREV_machine_qemumips ?= "3b2fd654392a2f33aed12748548c04e9b169591b"
+SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec"
+SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1"
+SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727"
+SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
+SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/6 linux-yocto: intel BSP config changes

In reply to Scott Garman

From: Bruce Ashfield <[email protected]>

Updating the meta SRCREV for the following fixes:

1dfd60f meta/fishriver: move smp options from recipe-space 012780a meta/emenlow: move smp options from recipe-space b59b1a5 meta/crownbay: move smp options from recipe-space 74dc6ac meta/sugarbay: remove boot-live options a4bedcb meta/jasperforest: remove boot-live options 4ae7b81 meta/sugarbay: use usb features
30e7e8c meta/jasperforest: use usb features 22d0c5d meta/fishriver: use usb features
e262965 meta/emenlow: use usb features

Signed-off-by Tom Zanussi <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +1 -1
index 7e01efb..5395d24 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7"
 SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c"
-SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
+SRCREV_meta ?= "1dfd60fa1250259eed38ae5b2840eb37e3758a1b"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +1 -1
index 27de229..5d6450e 100644
@@ -12,7 +12,7 @@ KCONFIG_MODE = "--allnoconfig"
 LINUX_VERSION ?= "3.2.11"
 
 SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246"
-SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
+SRCREV_meta ?= "1dfd60fa1250259eed38ae5b2840eb37e3758a1b"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +1 -1
index 51119bb..80e2dc9 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec"
 SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1"
 SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727"
 SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
-SRCREV_meta ?= "6b3d4e09aa2531e9649f3f03827b7efbccfcec03"
+SRCREV_meta ?= "1dfd60fa1250259eed38ae5b2840eb37e3758a1b"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/6 linux-yocto: policy cleanups

In reply to Scott Garman

From: Bruce Ashfield <[email protected]>

Updating the meta SRCREVs to pickup configuration policy cleanups:

49f931b meta/fishriver: remove redundant features and options 51a6d3f meta/emenlow: remove redundant features and options 101dd7f meta/crownbay: remove redundant features and options 4110ecd meta/sugarbay: remove redundant features and options 0f1304a meta/jasperforest: remove redundant features and options 0a56a3b meta/common-pc-64: factor out SCSI CDROM option b71938a meta/common-pc-64: use usb-mass-storage feature 0724f40 meta: add scsi cdrom feature
438bca8 meta/common-pc: use usb-mass-storage feature c970881 meta: factor out SCSI options from the usb-mass-storage feature 4c8135e meta: add scsi disk feature
6872a81 meta: add scsi feature
e706ec5 meta/sugarbay: factor out policy-related options 8b7fbc2 meta/jasperforest: factor out policy-related options fea1b0e meta/fishriver: factor out policy-related options 13bf9ab meta/emenlow: factor out policy-related options 4748d50 meta/crownbay: factor out policy-related options 44f592f meta/common-pc-64: factor out policy-related options 5a3f5c7 meta/common-pc: factor out policy-related options 1f5a10b meta/common-pc-64: use usb features
4b87723 meta/common-pc: use usb features
594ba05 meta: add ROOT_HUB_TT config option to the usb/ehci-hcd feature

Signed-off-by Tom Zanussi <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +1 -1
index 5395d24..21cd84d 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7"
 SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c"
-SRCREV_meta ?= "1dfd60fa1250259eed38ae5b2840eb37e3758a1b"
+SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +1 -1
index 5d6450e..f50e12e 100644
@@ -12,7 +12,7 @@ KCONFIG_MODE = "--allnoconfig"
 LINUX_VERSION ?= "3.2.11"
 
 SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246"
-SRCREV_meta ?= "1dfd60fa1250259eed38ae5b2840eb37e3758a1b"
+SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +1 -1
index 80e2dc9..c228794 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec"
 SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1"
 SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727"
 SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
-SRCREV_meta ?= "1dfd60fa1250259eed38ae5b2840eb37e3758a1b"
+SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.9.5
author
#4 lore raw

PATCH 4/6 linux-yocto/3.2: update to v3.2.18

In reply to Scott Garman

From: Bruce Ashfield <[email protected]>

Updating the 3.2 kernel SRCREVs to pickup the -stable update to v3.2.18.

Signed-off-by Bruce Ashfield <[email protected]>
Signed-off-by Richard Purdie <[email protected]>

Reworked commit to fix merge conflicts with denzil branch.

Signed-off-by Scott Garman <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |   16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +3 -3
index 21cd84d..690d3e9 100644
@@ -11,11 +11,11 @@ KMACHINE_qemumips = "mti-malta32-be"
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
 
-LINUX_VERSION ?= "3.2.11"
+LINUX_VERSION ?= "3.2.18"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7"
-SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c"
+SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087"
+SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f"
 SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r1"
meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +2 -2
index f50e12e..80be112 100644
@@ -9,9 +9,9 @@ KBRANCH = "standard/tiny"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.2.11"
+LINUX_VERSION ?= "3.2.18"
 
-SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246"
+SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
 SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r0"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +8 -8
index c228794..edffec9 100644
@@ -15,14 +15,14 @@ KBRANCH_qemuppc  = "standard/default/qemu-ppc32"
 KBRANCH_qemumips = "standard/default/mti-malta32-be"
 KBRANCH_qemuarm  = "standard/default/arm-versatile-926ejs"
 
-LINUX_VERSION ?= "3.2.11"
-
-SRCREV_machine_qemuarm ?= "ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e"
-SRCREV_machine_qemumips ?= "3b2fd654392a2f33aed12748548c04e9b169591b"
-SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec"
-SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1"
-SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727"
-SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
+LINUX_VERSION ?= "3.2.18"
+
+SRCREV_machine_qemuarm ?= "259cff0813417d16baaaaf44b00a9f75103ebfcb"
+SRCREV_machine_qemumips ?= "9a803ecc05b3af481036a6d9bb0da3a899be3074"
+SRCREV_machine_qemuppc ?= "466746d1fe6370957ba087f9ca6f2e31201b2162"
+SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48"
+SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c"
+SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
 SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r1"
Signature · 1 line
1.7.9.5
author
#5 lore raw

PATCH 5/6 linux-yocto/3.0: update to v3.0.32

In reply to Scott Garman

From: Bruce Ashfield <[email protected]>

Updating the 3.0 kernel SRCREVs to integrate the v3.0.32 -stable release.

Signed-off-by Bruce Ashfield <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |   16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +3 -3
index 36dcb6e..b6215c8 100644
@@ -11,11 +11,11 @@ KMACHINE_qemumips = "mti-malta32-be"
 KBRANCH = "yocto/standard/preempt-rt/base"
 KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
 
-LINUX_VERSION ?= "3.0.24"
+LINUX_VERSION ?= "3.0.32"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27"
-SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416"
+SRCREV_machine ?= "e67428d9966eecec4c081993dc64ceb5c0e64643"
+SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16"
 SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
 
 PR = "r2"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +8 -8
index 074b1ed..c4f976d 100644
@@ -10,14 +10,14 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 
 KBRANCH = "${KMACHINE}"
 
-LINUX_VERSION ?= "3.0.24"
-
-SRCREV_machine_qemuarm ?= "62bbe1d7a0e5c1200a99dabca889a52c9417b96b"
-SRCREV_machine_qemumips ?= "66de88919f24f1e590a48dae6de752a68fed2353"
-SRCREV_machine_qemuppc ?= "7528f1d06ef5665eed8c1498f62d5403b82bbbd6"
-SRCREV_machine_qemux86 ?= "f153b0eb8264dc1e69f59d4c9173619feb4d5bd9"
-SRCREV_machine_qemux86-64 ?= "aac580659dc0ce083f250fb05abf82e58d7f4531"
-SRCREV_machine ?= "da7c40006b08916ff3a3db104def82aaf9ac2716"
+LINUX_VERSION ?= "3.0.32"
+
+SRCREV_machine_qemuarm ?= "b8b6c3b6b3edf129ac26a27d779dd972c36e8ebd"
+SRCREV_machine_qemumips ?= "33a643547e983adb442ff8e15645881816b17a7d"
+SRCREV_machine_qemuppc ?= "bd9a3c4c066bd4b9f52b51aaaec9b029a7abe793"
+SRCREV_machine_qemux86 ?= "70342faea067476774eb55f4e3098af0bcc48782"
+SRCREV_machine_qemux86-64 ?= "cba836a545fbeb96f6f2392c3ecbac9d7735fa65"
+SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b"
 SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
 
 PR = "r4"
Signature · 1 line
1.7.9.5
author
#6 lore raw

PATCH 6/6 qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGS

In reply to Scott Garman

From: Anders Darander <[email protected]>

After the change to shell style functions (from python style), the ability to use oe_filter_out on QT_CONFIG_FLAGS got broken.

This patch solves that by referring to QT_ARCH in a more correct way.

Signed-off-by Anders Darander <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-qt/qt4/qt4-embedded.inc +1 -1
index 05803d1..9c5b4af 100644
@@ -10,7 +10,7 @@ QT_BASE_LIB  ?= "libqt-embedded"
 SRC_URI += "file://qte.sh"
 
 QT_CONFIG_FLAGS += " \
-    -embedded ${QT_ARCH} \
+    -embedded $QT_ARCH \
     -qtlibinfix ${QT_LIBINFIX} \
     -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
     -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
Signature · 1 line
1.7.9.5
Applied
#7 lore raw
In reply to Scott Garman
Quoted 10 lines · Scott Garman

Anders Darander (1):
qt4-embedded: fix QT_ARCH usage in QT_CONFIG_FLAGS

Bruce Ashfield (5):
linux-yocto/3.2: configuration and pch merge
linux-yocto: intel BSP config changes
linux-yocto: policy cleanups
linux-yocto/3.2: update to v3.2.18
linux-yocto/3.0: update to v3.0.32

Quoted 7 lines
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb   |    6 +++---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb      |   16 ++++++++--------
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |   18 +++++++++---------
 meta/recipes-qt/qt4/qt4-embedded.inc              |    2 +-
 6 files changed, 28 insertions(+), 28 deletions(-)

Merged to denzil, thanks.

Richard