summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2014-04-02 01:15:31 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2014-04-04 13:57:35 (GMT)
commit2b717f47ba15c4baadc173522897c20752ed7a51 (patch)
treeb86a82a53ca971ea572740d824168f5785bc4ef3
parent185ac2bc78f4c23c2023b5ecad3a21e3f3fc34de (diff)
downloadmeta-intel-2b717f47ba15c4baadc173522897c20752ed7a51.tar.gz
Make LINUX_VERSION machine specific
Make all the LINUX_VERSION variables in various kernel recipes machine specific to avoid name-space pollution. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend4
-rw-r--r--meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend4
-rw-r--r--meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend4
-rw-r--r--meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend4
4 files changed, 7 insertions, 9 deletions
diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 1b7ff84..b066135 100644
--- a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -11,12 +11,12 @@ KMACHINE_crownbay-noemgd = "crownbay"
11KBRANCH_crownbay-noemgd = "standard/crownbay" 11KBRANCH_crownbay-noemgd = "standard/crownbay"
12KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" 12KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb"
13 13
14LINUX_VERSION = "3.10.34" 14LINUX_VERSION_crownbay = "3.10.34"
15
16SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4" 15SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4"
17SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09" 16SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09"
18SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 17SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
19 18
19LINUX_VERSION_crownbay-noemgd = "3.10.34"
20SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" 20SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4"
21SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" 21SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09"
22 22
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 3bf0182..5ec5b69 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -11,12 +11,12 @@ KMACHINE_emenlow-noemgd = "emenlow"
11KBRANCH_emenlow-noemgd = "standard/emenlow" 11KBRANCH_emenlow-noemgd = "standard/emenlow"
12KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" 12KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
13 13
14LINUX_VERSION = "3.10.25" 14LINUX_VERSION_emenlow = "3.10.25"
15
16SRCREV_meta_emenlow = "df3aa753c8826127fb5ad811d56d57168551d6e4" 15SRCREV_meta_emenlow = "df3aa753c8826127fb5ad811d56d57168551d6e4"
17SRCREV_machine_emenlow = "79af968f2f26378798aec7a6d729ff5a371aae5f" 16SRCREV_machine_emenlow = "79af968f2f26378798aec7a6d729ff5a371aae5f"
18SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 17SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
19 18
19LINUX_VERSION_emenlow-noemgd = "3.10.25"
20SRCREV_meta_emenlow-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" 20SRCREV_meta_emenlow-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4"
21SRCREV_machine_emenlow-noemgd = "79af968f2f26378798aec7a6d729ff5a371aae5f" 21SRCREV_machine_emenlow-noemgd = "79af968f2f26378798aec7a6d729ff5a371aae5f"
22 22
diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 07eaa2a..cd731b8 100644
--- a/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,11 +1,10 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3LINUX_VERSION = "3.10.34"
4
5COMPATIBLE_MACHINE_fri2 = "fri2" 3COMPATIBLE_MACHINE_fri2 = "fri2"
6KMACHINE_fri2 = "fri2" 4KMACHINE_fri2 = "fri2"
7KBRANCH_fri2 = "standard/fri2" 5KBRANCH_fri2 = "standard/fri2"
8KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" 6KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
7LINUX_VERSION_fri2 = "3.10.34"
9SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4" 8SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4"
10SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09" 9SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09"
11SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" 10SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
@@ -15,6 +14,7 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
15KMACHINE_fri2-noemgd = "fri2" 14KMACHINE_fri2-noemgd = "fri2"
16KBRANCH_fri2-noemgd = "standard/fri2" 15KBRANCH_fri2-noemgd = "standard/fri2"
17KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" 16KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb"
17LINUX_VERSION_fri2-noemgd = "3.10.34"
18SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" 18SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4"
19SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" 19SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09"
20 20
diff --git a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 50f8561..f2cd683 100644
--- a/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,14 +1,12 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2 2
3
4COMPATIBLE_MACHINE_nuc = "nuc" 3COMPATIBLE_MACHINE_nuc = "nuc"
5KMACHINE_nuc = "chiefriver" 4KMACHINE_nuc = "chiefriver"
6KBRANCH_nuc = "standard/base" 5KBRANCH_nuc = "standard/base"
7 6
8KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" 7KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi"
9 8
10LINUX_VERSION = "3.10.34" 9LINUX_VERSION_nuc = "3.10.34"
11
12SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4" 10SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4"
13SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09" 11SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09"
14 12