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-jasperforest/conf/machine/jasperforest.conf | 2 -- .../recipes-kernel/linux/linux-yocto-stable_git.bbappend | 5 ----- .../recipes-kernel/linux/linux-yocto_2.6.34.bbappend | 4 ++++ .../recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 8 ++++++++ meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend | 6 ------ 5 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend delete mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend (limited to 'meta-jasperforest') diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf index fee6930b..3f8591a5 100644 --- a/meta-jasperforest/conf/machine/jasperforest.conf +++ b/meta-jasperforest/conf/machine/jasperforest.conf @@ -42,5 +42,3 @@ PREFERRED_VERSION_grub ?= "1.98" TARGET_CC_ARCH = "-m64" -SRCREV_machine_pn-linux-yocto_jasperforest ?= "2058f5a373c7ce4a94f8252df322704fc475de97" -SRCREV_meta_pn-linux-yocto_jasperforest ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend deleted file mode 100644 index bd6badab..00000000 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_jasperforest = "jasperforest" -KMACHINE_jasperforest = "jasperforest" - diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend new file mode 100644 index 00000000..0a89413c --- /dev/null +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.34.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_jasperforest = "jasperforest" +KMACHINE_jasperforest = "jasperforest" diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..d937d80e --- /dev/null +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_2.6.37.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_jasperforest = "jasperforest" + +KMACHINE_jasperforest = "yocto/standard/common-pc-64/jasperforest" + +SRCREV_machine_pn-linux-yocto_jasperforest ?= "2058f5a373c7ce4a94f8252df322704fc475de97" +SRCREV_meta_pn-linux-yocto_jasperforest ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index abceb182..00000000 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null @@ -1,6 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_jasperforest = "jasperforest" - -KMACHINE_jasperforest = "yocto/standard/common-pc-64/jasperforest" - -- cgit v1.2.3-54-g00ecf