linux-yocto/3.8: qemumips boot fixes and netfilter kernel features
Updating 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. (From OE-Core rev: 0271dec64591c4d91933b3a8db875a374a63640b) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
2a3f6772aa
commit
7c06aec133
|
@ -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)}"
|
||||
|
|
|
@ -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}"
|
||||
|
|
|
@ -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)}"
|
||||
|
|
Loading…
Reference in New Issue