From d207c9531effb40d75d4552f589cad60bf8a84e2 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 14 Jun 2011 16:47:20 -0400 Subject: meta-intel/linux-yocto: update to match the renamed linux-yocto recipes The linux-yocto recipes have been renamed to include explicit version numbers. The meta-intel bbappends must be updated to follow the new naming convention. As a consequence of the recipe renames any SRCREV specificiations that were part of a machine.conf have been moved to the corresponding bbappend file. This allows the 2.6.34 and 2.6.37 SRCREVs to co-exist. Signed-off-by: Bruce Ashfield Minor whitespace cleanup. Remove inadvertant? linux-libc-headers provider change. Signed-off-by: Darren Hart --- meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 ------ meta-crownbay/conf/machine/crownbay.conf | 6 ------ .../recipes-kernel/linux/linux-yocto-stable_git.bbappend | 9 --------- .../recipes-kernel/linux/linux-yocto_2.6.34.bbappend | 15 +++++++++++++++ .../recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 15 +++++++++++++++ .../recipes-kernel/linux/linux-yocto_git.bbappend | 9 --------- 6 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend delete mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend (limited to 'meta-crownbay') diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index 1916b2ff..cc0b2eb2 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf @@ -34,9 +34,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" - -SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "88ea187941f262518b3b8194e042f0270fdf27c4" -SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" - -SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" -SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 66341024..c66b8597 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -38,9 +38,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" - -SRCREV_machine_pn-linux-yocto_crownbay ?= "88ea187941f262518b3b8194e042f0270fdf27c4" -SRCREV_meta_pn-linux-yocto_crownbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" - -SRCREV_machine_pn-linux-yocto-stable_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" -SRCREV_meta_pn-linux-yocto-stable_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend deleted file mode 100644 index 570f8d4b..00000000 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_crownbay = "crownbay" -KMACHINE_crownbay = "crownbay" -KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" - -COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" -KMACHINE_crownbay-noemgd = "crownbay" -KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend new file mode 100644 index 00000000..6f3694b4 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.34.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_crownbay = "crownbay" +KMACHINE_crownbay = "crownbay" +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" + +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" +KMACHINE_crownbay-noemgd = "crownbay" +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" + +SRCREV_machine_pn-linux-yocto_crownbay ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" +SRCREV_meta_pn-linux-yocto_crownbay ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" + +RCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..1a62b383 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_crownbay = "crownbay" +KMACHINE_crownbay = "yocto/standard/crownbay" +KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" + +COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" +KMACHINE_crownbay-noemgd = "yocto/standard/crownbay" +KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" + +SRCREV_machine_pn-linux-yocto_crownbay ?= "88ea187941f262518b3b8194e042f0270fdf27c4" +SRCREV_meta_pn-linux-yocto_crownbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" + +SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "88ea187941f262518b3b8194e042f0270fdf27c4" +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index cdae0006..00000000 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_crownbay = "crownbay" -KMACHINE_crownbay = "yocto/standard/crownbay" -KERNEL_FEATURES_append_crownbay += " cfg/smp.scc" - -COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd" -KMACHINE_crownbay-noemgd = "yocto/standard/crownbay" -KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc" -- cgit v1.2.3-54-g00ecf