summaryrefslogtreecommitdiffstats
path: root/meta-fri2
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-07-27 01:31:33 (GMT)
committerTom Zanussi <tom.zanussi@linux.intel.com>2013-07-29 18:41:34 (GMT)
commit6d074cae27420c9148aab66fda535f89cb6b7ca0 (patch)
tree9752cc6f819093632220ffefb21c73c550b2e85e /meta-fri2
parent84fdca145a19d4715e2d743dd7b45c20e8ed9691 (diff)
downloadmeta-intel-6d074cae27420c9148aab66fda535f89cb6b7ca0.tar.gz
fri2: 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-fri2')
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend4
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend4
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend4
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
index 228a69b..5ef4835 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -3,7 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/fri2" 5KBRANCH_fri2 = "standard/fri2"
6KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" 6KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
7SRCREV_machine_fri2 = "60536206ad300ccf5b2be2c2d449f4ab27170238" 7SRCREV_machine_fri2 = "60536206ad300ccf5b2be2c2d449f4ab27170238"
8SRCREV_meta_fri2 = "fe20c99783387dab779472ff50a88666da1c6391" 8SRCREV_meta_fri2 = "fe20c99783387dab779472ff50a88666da1c6391"
9SRCREV_emgd_fri2 = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1" 9SRCREV_emgd_fri2 = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
@@ -11,7 +11,7 @@ SRCREV_emgd_fri2 = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
11COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 11COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
12KMACHINE_fri2-noemgd = "fri2" 12KMACHINE_fri2-noemgd = "fri2"
13KBRANCH_fri2-noemgd = "standard/fri2" 13KBRANCH_fri2-noemgd = "standard/fri2"
14KERNEL_FEATURES_fri2_append = " cfg/vesafb" 14KERNEL_FEATURES_append_fri2 = " cfg/vesafb"
15SRCREV_machine_fri2-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238" 15SRCREV_machine_fri2-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238"
16SRCREV_meta_fri2-noemgd = "fe20c99783387dab779472ff50a88666da1c6391" 16SRCREV_meta_fri2-noemgd = "fe20c99783387dab779472ff50a88666da1c6391"
17 17
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 05f4e8d..52dbd7d 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -3,14 +3,14 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
4KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
5KBRANCH_fri2 = "standard/fri2" 5KBRANCH_fri2 = "standard/fri2"
6KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb" 6KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.16 cfg/vesafb"
7SRCREV_machine_pn-linux-yocto_fri2 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" 7SRCREV_machine_pn-linux-yocto_fri2 ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
8SRCREV_meta_pn-linux-yocto_fri2 ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" 8SRCREV_meta_pn-linux-yocto_fri2 ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
9 9
10COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 10COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
11KMACHINE_fri2-noemgd = "fri2" 11KMACHINE_fri2-noemgd = "fri2"
12KBRANCH_fri2-noemgd = "standard/fri2" 12KBRANCH_fri2-noemgd = "standard/fri2"
13KERNEL_FEATURES_fri2_append = " cfg/vesafb" 13KERNEL_FEATURES_append_fri2 = " cfg/vesafb"
14SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f" 14SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "13809f2cfd9be0ce86bd486e1643f9b90bed6f4f"
15SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0" 15SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "f697e099bc76d5df3a307a5bc0cc25021dd6dfe0"
16 16
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
index 6560d29..46e1f15 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -5,7 +5,7 @@ LINUX_VERSION = "3.8.13"
5COMPATIBLE_MACHINE_fri2 = "fri2" 5COMPATIBLE_MACHINE_fri2 = "fri2"
6KMACHINE_fri2 = "fri2" 6KMACHINE_fri2 = "fri2"
7KBRANCH_fri2 = "standard/fri2" 7KBRANCH_fri2 = "standard/fri2"
8KERNEL_FEATURES_fri2_append = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 8KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
9SRCREV_meta_fri2 = "8ef9136539464c145963ac2b8ee0196fea1c2337" 9SRCREV_meta_fri2 = "8ef9136539464c145963ac2b8ee0196fea1c2337"
10SRCREV_machine_fri2 = "f20047520a57322f05d95a18a5fbd082fb15cb87" 10SRCREV_machine_fri2 = "f20047520a57322f05d95a18a5fbd082fb15cb87"
11SRCREV_emgd_fri2 = "a18cbb7a2886206815dbf6c85caed3cb020801e0" 11SRCREV_emgd_fri2 = "a18cbb7a2886206815dbf6c85caed3cb020801e0"
@@ -14,7 +14,7 @@ SRC_URI_fri2 = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;noch
14COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" 14COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
15KMACHINE_fri2-noemgd = "fri2" 15KMACHINE_fri2-noemgd = "fri2"
16KBRANCH_fri2-noemgd = "standard/fri2" 16KBRANCH_fri2-noemgd = "standard/fri2"
17KERNEL_FEATURES_fri2_append = " cfg/vesafb" 17KERNEL_FEATURES_append_fri2 = " cfg/vesafb"
18SRCREV_meta_fri2-noemgd = "8ef9136539464c145963ac2b8ee0196fea1c2337" 18SRCREV_meta_fri2-noemgd = "8ef9136539464c145963ac2b8ee0196fea1c2337"
19SRCREV_machine_fri2-noemgd = "f20047520a57322f05d95a18a5fbd082fb15cb87" 19SRCREV_machine_fri2-noemgd = "f20047520a57322f05d95a18a5fbd082fb15cb87"
20 20