linux-yocto/qemu/kern-tools: 1.4 release items
cover linux-yocto/qemu/kern-tools: 1.4 release items
Hi all,
I'm broadcasting the following 8 patch series that went into various trees in the past few days to fix some pressing 1.4 issues. There is no further action required on this series (unless something breaks).
We'll be revisiting some of the last minute config and kernel changes, since they are real issues in the mainline kernel that need work to resolve.
Cheers,
Bruce
The following changes since commit cb4db44c14959ca76870cfaf02b5d314ac68ba8f:
initscripts: fix read-only-rootfs-hook.sh to start earlier (2013-04-10 16:49:24 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/yocto-1.4-fixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/yocto-1.4-fixes
Bruce Ashfield (8):
linux/yocto: update AUTOFS configuration linux-yocto/3.8: fix atom-pc config audit warnings linux-yocto/3.8: atom-pc: Update atom-pc-preempt-rt.scc to reuse
config from common-pc
kern-tools: fix excluded configuration processing linux-yocto/3.8: aufs, config processing, tiny, mips boot fixes linux-yocto/3.8: qemumips graphical boot linux-yocto/3.8: qemumips boot fixes and netfilter kernel features
kern-tools: fix conditional configuration items
.../kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 11 ++++++----- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 19 ++++++++++--------- 4 files changed, 19 insertions(+), 17 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/8 linux/yocto: update AUTOFS configuration
When systemd is enabled, qemumips failed to boot with the following trace:
Reserved instruction in kernel code[#1]:
Cpu 0
$ 0 : 00000000 80232500 c0011000 80000000
$ 4 : c0017440 00000000 87032400 8704b000
$ 8 : 00000000 00000000 00000010 003fffff
$12 : 00000000 7fafbab4 00000000 87d6fbb0
$16 : 87f98780 c0017440 c0017440 00000000
$20 : 8704a000 00000000 8704a000 00000000
$24 : 00000010 80480630
$28 : 87c22000 87c23e28 7fafbc00 80232408
Hi : 00000000
Lo : 00000000
epc : c0011000 autofs_mount+0x0/0x30 [autofs4]
Not tainted
ra : 80232408 mount_fs+0x68/0x200
Status: 1000a403 KERNEL EXL IE
Cause : d0808028
PrId : 00019300 (MIPS 24Kc)
Modules linked in: autofs4
Process systemd (pid: 1, threadinfo=87c22000, task=87c28000, tls=77787490)
Stack : 809b3e28 802512bc 00000000 808b0da4 87f3d310 87936c38 87032400 8704b000
87f98780 c0017440 00000020 8704b000 87032400 87032480 00000000 80251a2c
00000006 8022f7fc 87032480 802507f0 00000000 87032400 8704b000 7fafba94
00000000 c0017440 8088275c 80253f40 7fafb9d0 00000016 38513fac 0051b2a8
8704b000 801df604 00000000 0000000a 87f5c000 801f5968 87f3d310 87936c38
...
Call Trace:
[<c0011000>] autofs_mount+0x0/0x30 [autofs4]
[<80232408>] mount_fs+0x68/0x200
[<80251a2c>] vfs_kern_mount+0x68/0x114
[<80253f40>] do_mount+0x218/0x9d0
[<8025479c>] sys_mount+0xa4/0xec
[<8010c07c>] stack_done+0x20/0x44The policy of building AUTOFS as a module is something that can be changed, since boot processes that use automounting can take advantage of the built in support to reduce complexity.
The size increase of the base policy is small with this change, and users of the linux-yocto kernel can still override this value, which is exactly what the poky-tiny kernel does.
Keeping the configuration consistent for all boards, and not adding and exception for qemumips makes sense in this case.
[YOCTO #4129]
(From OE-Core rev: 3570cf11b7dfa6991c43bb041abb9d47cc6f0d70)
--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +1 -1
@@ -10,7 +10,7 @@ KMETA = "meta" SRCREV_machine ?= "abd0728b164f651292374e96251ee197b50e3c02" SRCREV_machine_qemuppc ?= "1619988b773840ec546292a9cd65dda99d55b96c" -SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" +SRCREV_meta ?= "70dac5a56c245ca01d2d4e18fc2c9fb112749bf3" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +1 -1
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "f8848d222d1fcd1ebc517d28f289735621708449" SRCREV_machine_qemux86 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" SRCREV_machine_qemux86-64 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" -SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f" +SRCREV_meta ?= "70dac5a56c245ca01d2d4e18fc2c9fb112749bf3" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.7.10.4
PATCH 2/8 linux-yocto/3.8: fix atom-pc config audit warnings
In reply to Bruce AshfieldThe atom-pc was referencing some invalid and unecessary config options that are causing kernel config audit warnings.
With this SRCREV update, the configuration is clean against the 3.8 kernel.
[YOCTO #3490]
(From OE-Core rev: 9f3ff1f907a0cf65d8aff82134463c4321d4b1e2)
--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +1 -1
@@ -10,7 +10,7 @@ KMETA = "meta" SRCREV_machine ?= "abd0728b164f651292374e96251ee197b50e3c02" SRCREV_machine_qemuppc ?= "1619988b773840ec546292a9cd65dda99d55b96c" -SRCREV_meta ?= "70dac5a56c245ca01d2d4e18fc2c9fb112749bf3" +SRCREV_meta ?= "f86199dd4c142fae61517a993b3f7162bb6d4f94" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +1 -1
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "f8848d222d1fcd1ebc517d28f289735621708449" SRCREV_machine_qemux86 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" SRCREV_machine_qemux86-64 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" -SRCREV_meta ?= "70dac5a56c245ca01d2d4e18fc2c9fb112749bf3" +SRCREV_meta ?= "f86199dd4c142fae61517a993b3f7162bb6d4f94" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.7.10.4
PATCH 3/8 linux-yocto/3.8: atom-pc: Update atom-pc-preempt-rt.scc to reuse config from common-pc
In reply to Bruce AshfieldUpdating the meta branch SRCREV to pick up the following change:
The atom-pc preempt-rt BSP was omitting the config from common-pc, resulting in very few drivers being built, including USB_STORAGE, preventing preliminary boot testing.
Remove the "standard features" as those are covered by the common-pc scc files.
(From OE-Core rev: 1e20b3cbc8da3e6729d3825c62422c0dd82e1577)
--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +1 -1
@@ -10,7 +10,7 @@ KMETA = "meta" SRCREV_machine ?= "abd0728b164f651292374e96251ee197b50e3c02" SRCREV_machine_qemuppc ?= "1619988b773840ec546292a9cd65dda99d55b96c" -SRCREV_meta ?= "f86199dd4c142fae61517a993b3f7162bb6d4f94" +SRCREV_meta ?= "a601ed4fb7b68db2fb0198993f85590b1b90f758" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +1 -1
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "f8848d222d1fcd1ebc517d28f289735621708449" SRCREV_machine_qemux86 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" SRCREV_machine_qemux86-64 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" -SRCREV_meta ?= "f86199dd4c142fae61517a993b3f7162bb6d4f94" +SRCREV_meta ?= "a601ed4fb7b68db2fb0198993f85590b1b90f758" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.7.10.4
PATCH 4/8 kern-tools: fix excluded configuration processing
In reply to Bruce AshfieldOne of the features introduced early on in the 1.4 release cycle was the ability to include a kernel feature, but only get its patches and not configs (and vice versa).
As it turns out, this only was exercised recently and once a single include with dropped configs was started, ALL configuration values following the commit were dropped.
To fix the problem, the processing of kernel features has been split into two. Where the features are preprocessed and the assembled/complete file is used to generate the meta-series (which is later applied to the tree). The logic of the tools is the same, but the two phases of processing allows configuration values to be excluded properly and simply, while keeping the logic for modifying the tree in a separate step.
All changes are invisible to the user, and are done within the existing scripts and build system bindings. Output series and manipulations to the tree are the same as they were before this change.
Updating the kern-tools SRCREV to pickup the kern-tools changes for this.
(From OE-Core rev: 961ab0ac53de317c22409d90244a313998959714)
--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c DEPENDS = "git-native guilt-native" -SRCREV = "d484e3f731f38f5b4e05e13102c97d06106edfb5" +SRCREV = "89821213a5df891254f40c9ddccdcfd780d25c3f" PR = "r12" PV = "0.1+git${SRCPV}"
Signature · 1 line
1.7.10.4
PATCH 5/8 linux-yocto/3.8: aufs, config processing, tiny, mips boot fixes
In reply to Bruce AshfieldUpdating the SRCREVs to fix a number of bugs, boot issues and ktype support additions.
standard/*:
Aufs support was misplaced on the move from the -dev to release kernel, this commit restores the support. This is not active unless the aufs configuration items are enabled via the aufs-enable.scc feature.
11998bd aufs: core support
f2ea9f4 aufs: standalone support
bf529b6 aufs: aufs proc_map
b6f0a04 aufs: aufs base support
55b0bc2 aufs: kbuild patch
meta:
The meta branch has updates for aufs enablement, tiny BSP configs, preempt-rt fixes and a wifi config audit fix.
4c567e0 meta/aufs: add -enable feature and patches 059fe88 meta/aufs: create aufs configuration fragment 7d672cd0 meta: add fri2 tiny BSP config.
mti-malta32:
This fixes the graphical boot of qemumips, the offending commit is breaking dynamic patching of ftrace on the simulation, so we revert the commit for now.
18c71ab Revert "ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()"
mti-malta64:
This enables the boot of qemumips64 by reverting the broken ftrace support for mips64 and by stubbing out inavlid oprofile register writes.
0ec615c Revert "ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()" bbefde3 oprofile/mips: do not set perf_irq for qemu mips 64 eb6cb79 Revert "MIPS: Function tracer: Fix broken function tracing"
[YOCTO #4052]
[YOCTO #4129]
[YOCTO #2410]
(From OE-Core rev: 3d88f61b59f0a07e199306bf3a15ab023e77e17d)
--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +3 -3
@@ -8,9 +8,9 @@ LINUX_KERNEL_TYPE = "preempt-rt" KMETA = "meta" -SRCREV_machine ?= "abd0728b164f651292374e96251ee197b50e3c02" -SRCREV_machine_qemuppc ?= "1619988b773840ec546292a9cd65dda99d55b96c" -SRCREV_meta ?= "a601ed4fb7b68db2fb0198993f85590b1b90f758" +SRCREV_machine ?= "0f7d294a9d07713059af345188f9cd4f549b4e77" +SRCREV_machine_qemuppc ?= "82cdb00523b3f86219706d9f12dc80ff8d1c747a" +SRCREV_meta ?= "4c567e02266ebe383abc6755b4f7908696ac099d" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb +2 -2
@@ -12,8 +12,8 @@ LINUX_VERSION ?= "3.8.4" KMETA = "meta" -SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" -SRCREV_meta ?= "f86199dd4c142fae61517a993b3f7162bb6d4f94" +SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" +SRCREV_meta ?= "4c567e02266ebe383abc6755b4f7908696ac099d" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +7 -7
@@ -3,13 +3,13 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" -SRCREV_machine_qemuarm ?= "bf458ca0e48f4f57cbb02b52070a000f361eec84" -SRCREV_machine_qemumips ?= "c7297b41016919c95a2c779cafc0aad736f6a400" -SRCREV_machine_qemuppc ?= "f8848d222d1fcd1ebc517d28f289735621708449" -SRCREV_machine_qemux86 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" -SRCREV_machine_qemux86-64 ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" -SRCREV_machine ?= "42ddf06111efe45f3c36012d5a04a1eeb9781f42" -SRCREV_meta ?= "a601ed4fb7b68db2fb0198993f85590b1b90f758" +SRCREV_machine_qemuarm ?= "ec3299eaa89a7302009e3d46c9570f633ff32e9a" +SRCREV_machine_qemumips ?= "e5e37d6aab5d82398f874f623ec9b37a8274f41a" +SRCREV_machine_qemuppc ?= "223428bbc1a355200bd9a8046fd272c1b9b13e67" +SRCREV_machine_qemux86 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" +SRCREV_machine_qemux86-64 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" +SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" +SRCREV_meta ?= "4c567e02266ebe383abc6755b4f7908696ac099d" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.7.10.4
PATCH 6/8 linux-yocto/3.8: qemumips graphical boot
In reply to Bruce AshfieldUpdating the meta SRCREV to fix and illegal instruction that is seen when launching X with USB pointing devices.
meta/qemumips: build USB_UHCI_HCD into the kernel
When booting qemumips and USB_UHCI_HCD built as a module, the following
trace is seen, and then prevents X from starting:
qemumips user.warn kernel: Call Trace:
qemumips user.warn kernel: [<c0028000>] uhci_check_bandwidth+0x0/0x160 [uhci_hcd]
qemumips user.warn kernel: [<c002e08c>] uhci_urb_enqueue+0xba4/0xc48 [uhci_hcd]
qemumips user.warn kernel: [<8058092c>] usb_hcd_submit_urb+0xdc/0x848
qemumips user.warn kernel: [<805b8fbc>] wacom_open+0x44/0x8c
qemumips user.warn kernel: [<805a1990>] input_open_device+0xac/0xec
qemumips user.warn kernel: [<805a8cec>] evdev_open+0x188/0x1bc
qemumips user.warn kernel: [<802331d8>] chrdev_open+0xc8/0x1c4
qemumips user.warn kernel: [<8022b338>] do_dentry_open+0x248/0x2e4
qemumips user.warn kernel: [<8022b418>] finish_open+0x44/0x68
qemumips user.warn kernel: [<8023e51c>] do_last.isra.29+0x2c0/0xcbc
qemumips user.warn kernel: [<8023efd8>] path_openat+0xc0/0x52c
qemumips user.warn kernel: [<8023f840>] do_filp_open+0x4c/0xbc
qemumips user.warn kernel: [<8022cc3c>] do_sys_open+0x128/0x20c
qemumips user.warn kernel: [<8010c07c>] stack_done+0x20/0x44
qemumips user.warn kernel: Code: (Bad address in epc)
qemumips user.warn kernel: ---[ end trace 8a48c6046870f8c2 ]---
Building the module into the kernel fixes the problem, but the root
cause is still under investigation. The pipelines around jumps to
module addresses seem to be triggering invalid instructions.(From OE-Core rev: b7b7ebe57bd6fd248e80be0b7e517a3ceb7cfd11)
--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +1 -1
@@ -10,7 +10,7 @@ KMETA = "meta" SRCREV_machine ?= "0f7d294a9d07713059af345188f9cd4f549b4e77" SRCREV_machine_qemuppc ?= "82cdb00523b3f86219706d9f12dc80ff8d1c747a" -SRCREV_meta ?= "4c567e02266ebe383abc6755b4f7908696ac099d" +SRCREV_meta ?= "1b94482e3ab8f7e495ee4d6971e13cdad1990e8e" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb +1 -1
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.8.4" KMETA = "meta" SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" -SRCREV_meta ?= "4c567e02266ebe383abc6755b4f7908696ac099d" +SRCREV_meta ?= "1b94482e3ab8f7e495ee4d6971e13cdad1990e8e" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +1 -1
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "223428bbc1a355200bd9a8046fd272c1b9b13e67" SRCREV_machine_qemux86 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" SRCREV_machine_qemux86-64 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" -SRCREV_meta ?= "4c567e02266ebe383abc6755b4f7908696ac099d" +SRCREV_meta ?= "1b94482e3ab8f7e495ee4d6971e13cdad1990e8e" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
Signature · 1 line
1.7.10.4
PATCH 7/8 linux-yocto/3.8: qemumips boot fixes and netfilter kernel features
In reply to Bruce AshfieldUpdating the linux-yocto-3.8 recipes to fix two issues:
1) qemumips boot
This is fixed by:
Revert "Input: i8042-io - fix up region handling on MIPS"
And by disabling ftrace for qemumips boards
2) netfilter options being dropped
When KERNEL_EXTRA_FEATURES was introduced, and allowed to be inhibited, the variable was only applied to qemux86 machines. It should be applied ot all machine types (unless inhibited), so we restore that functionality.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb | 7 ++++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.8.bb | 9 +++++---- 3 files changed, 10 insertions(+), 8 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb +4 -3
@@ -10,7 +10,7 @@ KMETA = "meta" SRCREV_machine ?= "0f7d294a9d07713059af345188f9cd4f549b4e77" SRCREV_machine_qemuppc ?= "82cdb00523b3f86219706d9f12dc80ff8d1c747a" -SRCREV_meta ?= "1b94482e3ab8f7e495ee4d6971e13cdad1990e8e" +SRCREV_meta ?= "27b63fdbd25ad1a37bacc05f49a205c150d21779" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
@@ -24,6 +24,7 @@ COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" -KERNEL_FEATURES_append_qemux86=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb +1 -1
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.8.4" KMETA = "meta" SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" -SRCREV_meta ?= "1b94482e3ab8f7e495ee4d6971e13cdad1990e8e" +SRCREV_meta ?= "27b63fdbd25ad1a37bacc05f49a205c150d21779" PR = "${INC_PR}.0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.8.bb +5 -4
@@ -4,12 +4,12 @@ KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" SRCREV_machine_qemuarm ?= "ec3299eaa89a7302009e3d46c9570f633ff32e9a" -SRCREV_machine_qemumips ?= "e5e37d6aab5d82398f874f623ec9b37a8274f41a" +SRCREV_machine_qemumips ?= "0d60789d710808e38690f27216c3ab13753e1055" SRCREV_machine_qemuppc ?= "223428bbc1a355200bd9a8046fd272c1b9b13e67" SRCREV_machine_qemux86 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" SRCREV_machine_qemux86-64 ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" SRCREV_machine ?= "11998bd1f44b21cd0b8c0ca11cbd36865f14bfdc" -SRCREV_meta ?= "1b94482e3ab8f7e495ee4d6971e13cdad1990e8e" +SRCREV_meta ?= "27b63fdbd25ad1a37bacc05f49a205c150d21779" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
@@ -24,6 +24,7 @@ COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemux86-64" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append_qemux86=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" ${KERNEL_EXTRA_FEATURES} cfg/sound.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
Signature · 1 line
1.7.10.4
PATCH 8/8 kern-tools: fix conditional configuration items
In reply to Bruce AshfieldVariables defined in .scc files have two purposes:
- Documentation in the meta-series
- Variables that can be tested in sub sections and other features
The second part of this functionality was broken when fixing configuration for tiny/small systems. As a result, arch tests were failing and configs were dropped. This restores the existing functionality.
--- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c DEPENDS = "git-native guilt-native" -SRCREV = "89821213a5df891254f40c9ddccdcfd780d25c3f" +SRCREV = "e3f59062bc594239856549e165c9e373cbbac1d6" PR = "r12" PV = "0.1+git${SRCPV}"
Signature · 1 line
1.7.10.4