diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/poky-default-revisions.inc | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_git.bb | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 15802fabdf..fc9f3a76c0 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -21,7 +21,9 @@ do_patch() { | |||
21 | 21 | ||
22 | # updates or generates the target description | 22 | # updates or generates the target description |
23 | if [ -n "${KERNEL_FEATURES}" ]; then | 23 | if [ -n "${KERNEL_FEATURES}" ]; then |
24 | addon_features="--features ${KERNEL_FEATURES}" | 24 | for feat in ${KERNEL_FEATURES}; do |
25 | addon_features="$addon_features --feature $feat" | ||
26 | done | ||
25 | fi | 27 | fi |
26 | updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR} | 28 | updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR} |
27 | if [ $? -ne 0 ]; then | 29 | if [ $? -ne 0 ]; then |
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc index 32f105a2b3..5321c5a503 100644 --- a/meta/conf/distro/include/poky-default-revisions.inc +++ b/meta/conf/distro/include/poky-default-revisions.inc | |||
@@ -59,7 +59,7 @@ SRCREV_pn-gypsy ??= "3652e1f37e82b8e63983e30fda3482cd099a8cf5" | |||
59 | SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" | 59 | SRCREV_pn-inputproto ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" |
60 | SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" | 60 | SRCREV_pn-inputproto-native ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" |
61 | SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" | 61 | SRCREV_pn-inputproto-nativesdk ??= "7203036522ba9d4b224d282d6afc2d0b947711ee" |
62 | SRCREV_pn-kern-tools-native ??= "4f13a46499261ea181fdc13db5459067df08aca7" | 62 | SRCREV_pn-kern-tools-native ??= "8f61abb6344e78677450994e8930cabc86102d78" |
63 | SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" | 63 | SRCREV_pn-libdrm ??= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" |
64 | SRCREV_pn-libfakekey ??= "e8c2e412ea4a417afc1f30e32cb7bdc508b1dccc" | 64 | SRCREV_pn-libfakekey ??= "e8c2e412ea4a417afc1f30e32cb7bdc508b1dccc" |
65 | SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f" | 65 | SRCREV_pn-libgdbus ??= "aeab6e3c0185b271ca343b439470491b99cc587f" |
@@ -109,7 +109,7 @@ SRCREV_machine_pn-linux-yocto_routerstationpro ?= "b557fff9c7f864ea2a9c81ac80ec1 | |||
109 | SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "8f0124a21f5563b0c51c8426f4430ac222bd463d" | 109 | SRCREV_machine_pn-linux-yocto_mpc8315e-rdb ?= "8f0124a21f5563b0c51c8426f4430ac222bd463d" |
110 | SRCREV_machine_pn-linux-yocto_beagleboard ?= "929567ec621cf99e0932d8ede34f756e25d4c751" | 110 | SRCREV_machine_pn-linux-yocto_beagleboard ?= "929567ec621cf99e0932d8ede34f756e25d4c751" |
111 | SRCREV_machine_pn-linux-yocto ?= "929567ec621cf99e0932d8ede34f756e25d4c751" | 111 | SRCREV_machine_pn-linux-yocto ?= "929567ec621cf99e0932d8ede34f756e25d4c751" |
112 | SRCREV_meta_pn-linux-yocto ?= "29047c254624e0bd8a0ac6da92862f7c6357cb0b" | 112 | SRCREV_meta_pn-linux-yocto ?= "94772ea4f51267a6a9aaffd106035d47dfef1354" |
113 | SRCREV_pn-linux-libc-headers-yocto ??= "929567ec621cf99e0932d8ede34f756e25d4c751" | 113 | SRCREV_pn-linux-libc-headers-yocto ??= "929567ec621cf99e0932d8ede34f756e25d4c751" |
114 | SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" | 114 | SRCREV_pn-matchbox-config-gtk ??= "3ed74dfb7c57be088a5ab36e446c0ccde9fa1028" |
115 | SRCREV_pn-matchbox-desktop-sato ??= "76" | 115 | SRCREV_pn-matchbox-desktop-sato ??= "76" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_git.bb b/meta/recipes-kernel/linux/linux-yocto_git.bb index 75c6fb1653..9a3c666ae8 100644 --- a/meta/recipes-kernel/linux/linux-yocto_git.bb +++ b/meta/recipes-kernel/linux/linux-yocto_git.bb | |||
@@ -17,7 +17,7 @@ KMETA = meta | |||
17 | 17 | ||
18 | LINUX_VERSION ?= "2.6.37" | 18 | LINUX_VERSION ?= "2.6.37" |
19 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" | 19 | LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" |
20 | PR = "r15" | 20 | PR = "r16" |
21 | PV = "${LINUX_VERSION}+git${SRCPV}" | 21 | PV = "${LINUX_VERSION}+git${SRCPV}" |
22 | SRCREV_FORMAT = "meta_machine" | 22 | SRCREV_FORMAT = "meta_machine" |
23 | 23 | ||
@@ -28,7 +28,9 @@ COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64|mpc8315e-rdb| | |||
28 | 28 | ||
29 | # Functionality flags | 29 | # Functionality flags |
30 | KERNEL_REVISION_CHECKING ?= "t" | 30 | KERNEL_REVISION_CHECKING ?= "t" |
31 | KERNEL_FEATURES=features/netfilter | 31 | KERNEL_FEATURES="features/netfilter" |
32 | KERNEL_FEATURES_append_qemux86=" cfg/sound" | ||
33 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound" | ||
32 | 34 | ||
33 | # extra tasks | 35 | # extra tasks |
34 | addtask kernel_link_vmlinux after do_compile before do_install | 36 | addtask kernel_link_vmlinux after do_compile before do_install |