summaryrefslogtreecommitdiffstats
path: root/meta-crownbay
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-07-27 01:30:04 (GMT)
committerTom Zanussi <tom.zanussi@linux.intel.com>2013-07-29 18:41:12 (GMT)
commit75ac6a2a98fe76653dfb55da5c5afd592ec18acb (patch)
tree858d483fe39eab0b618c10c96d45094e9cb0ff86 /meta-crownbay
parent2173e8f778a381012028ee79d5dc3351606a9bdb (diff)
downloadmeta-intel-75ac6a2a98fe76653dfb55da5c5afd592ec18acb.tar.gz
crownbay: correct the KERNEL_FEATURE variable name
The var KERNEL_FEATURES_sugarbay_append overrides the previous value defined in the oecore layer, and the var KERNEL_FEATURES_append_sugarbay preserves the old value and extends it. This change avoids unintentional disabling of some KERNEL_FEATURES such as netfilter. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'meta-crownbay')
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend4
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend4
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend4
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
index 10bced8..8bc18e4 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_crownbay = "crownbay" 3COMPATIBLE_MACHINE_crownbay = "crownbay"
4KMACHINE_crownbay = "crownbay" 4KMACHINE_crownbay = "crownbay"
5KBRANCH_crownbay = "standard/crownbay" 5KBRANCH_crownbay = "standard/crownbay"
6KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" 6KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
7 7
8COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 8COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
9KMACHINE_crownbay-noemgd = "crownbay" 9KMACHINE_crownbay-noemgd = "crownbay"
10KBRANCH_crownbay-noemgd = "standard/crownbay" 10KBRANCH_crownbay-noemgd = "standard/crownbay"
11KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" 11KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
12 12
13SRCREV_meta_crownbay = "fe20c99783387dab779472ff50a88666da1c6391" 13SRCREV_meta_crownbay = "fe20c99783387dab779472ff50a88666da1c6391"
14SRCREV_machine_crownbay = "60536206ad300ccf5b2be2c2d449f4ab27170238" 14SRCREV_machine_crownbay = "60536206ad300ccf5b2be2c2d449f4ab27170238"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 8367a0e..1f264b8 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_crownbay = "crownbay" 3COMPATIBLE_MACHINE_crownbay = "crownbay"
4KMACHINE_crownbay = "crownbay" 4KMACHINE_crownbay = "crownbay"
5KBRANCH_crownbay = "standard/crownbay" 5KBRANCH_crownbay = "standard/crownbay"
6KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" 6KERNEL_FEATURES_append_crownbay= " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
7 7
8COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 8COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
9KMACHINE_crownbay-noemgd = "crownbay" 9KMACHINE_crownbay-noemgd = "crownbay"
10KBRANCH_crownbay-noemgd = "standard/crownbay" 10KBRANCH_crownbay-noemgd = "standard/crownbay"
11KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" 11KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
12 12
13SRCREV_machine_pn-linux-yocto_crownbay ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868" 13SRCREV_machine_pn-linux-yocto_crownbay ?= "de0c0ed674dfdbd808657e299fc720d8a97cb868"
14SRCREV_meta_pn-linux-yocto_crownbay ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac" 14SRCREV_meta_pn-linux-yocto_crownbay ?= "9473a39c59bf9c07a316486d272652bacb9ad3ac"
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
index a11c89d..469b2e8 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -3,12 +3,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_crownbay = "crownbay" 3COMPATIBLE_MACHINE_crownbay = "crownbay"
4KMACHINE_crownbay = "crownbay" 4KMACHINE_crownbay = "crownbay"
5KBRANCH_crownbay = "standard/crownbay" 5KBRANCH_crownbay = "standard/crownbay"
6KERNEL_FEATURES_crownbay_append = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 6KERNEL_FEATURES_append_crownbay = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
7 7
8COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" 8COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
9KMACHINE_crownbay-noemgd = "crownbay" 9KMACHINE_crownbay-noemgd = "crownbay"
10KBRANCH_crownbay-noemgd = "standard/crownbay" 10KBRANCH_crownbay-noemgd = "standard/crownbay"
11KERNEL_FEATURES_crownbay-noemgd_append = " cfg/vesafb" 11KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
12 12
13LINUX_VERSION = "3.8.13" 13LINUX_VERSION = "3.8.13"
14 14