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-fishriver/conf/machine/fishriver.conf | 6 ------ .../recipes-kernel/linux/linux-yocto-stable_git.bbappend | 5 ----- meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend | 7 +++++++ meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 6 ++++++ meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend | 3 --- 5 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend delete mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend (limited to 'meta-fishriver') diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf index 9621f627..e692cac3 100644 --- a/meta-fishriver/conf/machine/fishriver.conf +++ b/meta-fishriver/conf/machine/fishriver.conf @@ -34,9 +34,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" - -SRCREV_machine_pn-linux-yocto_fishriver ?= "697d84759be192403a8a87ab269196c67a0c2c88" -SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" - -SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" -SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend deleted file mode 100644 index 29399ba2..00000000 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_fishriver = "fishriver" -KMACHINE_fishriver = "fishriver" - diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend new file mode 100644 index 00000000..4084964b --- /dev/null +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.34.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_fishriver = "fishriver" +KMACHINE_fishriver = "fishriver" + +SRCREV_machine_pn-linux-yocto-stable_fishriver ?= "56fe215d3f1a2cc3a5a26482ac9809ba44495695" +SRCREV_meta_pn-linux-yocto-stable_fishriver ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..b7671095 --- /dev/null +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto_2.6.37.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +COMPATIBLE_MACHINE_fishriver = "fishriver" +KMACHINE_fishriver = "yocto/standard/fishriver" + +SRCREV_machine_pn-linux-yocto_fishriver ?= "697d84759be192403a8a87ab269196c67a0c2c88" +SRCREV_meta_pn-linux-yocto_fishriver ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index eec65d8b..00000000 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_fishriver = "fishriver" -KMACHINE_fishriver = "yocto/standard/fishriver" -- cgit v1.2.3-54-g00ecf