From 2b717f47ba15c4baadc173522897c20752ed7a51 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 1 Apr 2014 18:15:31 -0700 Subject: 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 --- meta-crownbay/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- meta-fri2/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 ++-- meta-nuc/recipes-kernel/linux/linux-yocto_3.10.bbappend | 4 +--- 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 1b7ff84c..b0661358 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" KBRANCH_crownbay-noemgd = "standard/crownbay" KERNEL_FEATURES_append_crownbay-noemgd = " cfg/vesafb" -LINUX_VERSION = "3.10.34" - +LINUX_VERSION_crownbay = "3.10.34" SRCREV_meta_crownbay = "df3aa753c8826127fb5ad811d56d57168551d6e4" SRCREV_machine_crownbay = "c7739be126930006e3bfbdb2fb070a967abc5e09" SRCREV_emgd_crownbay = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" +LINUX_VERSION_crownbay-noemgd = "3.10.34" SRCREV_meta_crownbay-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" SRCREV_machine_crownbay-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" 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 3bf0182b..5ec5b69e 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" KBRANCH_emenlow-noemgd = "standard/emenlow" KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500" -LINUX_VERSION = "3.10.25" - +LINUX_VERSION_emenlow = "3.10.25" SRCREV_meta_emenlow = "df3aa753c8826127fb5ad811d56d57168551d6e4" SRCREV_machine_emenlow = "79af968f2f26378798aec7a6d729ff5a371aae5f" SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" +LINUX_VERSION_emenlow-noemgd = "3.10.25" SRCREV_meta_emenlow-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" SRCREV_machine_emenlow-noemgd = "79af968f2f26378798aec7a6d729ff5a371aae5f" 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 07eaa2a4..cd731b89 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -LINUX_VERSION = "3.10.34" - COMPATIBLE_MACHINE_fri2 = "fri2" KMACHINE_fri2 = "fri2" KBRANCH_fri2 = "standard/fri2" KERNEL_FEATURES_append_fri2 = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb" +LINUX_VERSION_fri2 = "3.10.34" SRCREV_meta_fri2 = "df3aa753c8826127fb5ad811d56d57168551d6e4" SRCREV_machine_fri2 = "c7739be126930006e3bfbdb2fb070a967abc5e09" SRCREV_emgd_fri2 = "42d5e4548e8e79e094fa8697949eed4cf6af00a3" @@ -15,6 +14,7 @@ COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd" KMACHINE_fri2-noemgd = "fri2" KBRANCH_fri2-noemgd = "standard/fri2" KERNEL_FEATURES_append_fri2-noemgd = " cfg/vesafb" +LINUX_VERSION_fri2-noemgd = "3.10.34" SRCREV_meta_fri2-noemgd = "df3aa753c8826127fb5ad811d56d57168551d6e4" SRCREV_machine_fri2-noemgd = "c7739be126930006e3bfbdb2fb070a967abc5e09" 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 50f8561c..f2cd683e 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - COMPATIBLE_MACHINE_nuc = "nuc" KMACHINE_nuc = "chiefriver" KBRANCH_nuc = "standard/base" KERNEL_FEATURES_append_nuc = " features/amt/mei/mei.scc wifi" -LINUX_VERSION = "3.10.34" - +LINUX_VERSION_nuc = "3.10.34" SRCREV_meta_nuc = "df3aa753c8826127fb5ad811d56d57168551d6e4" SRCREV_machine_nuc = "c7739be126930006e3bfbdb2fb070a967abc5e09" -- cgit v1.2.3-54-g00ecf