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 --------- meta-emenlow/conf/machine/emenlow.conf | 6 ------ .../recipes-kernel/linux/linux-yocto-stable_git.bbappend | 3 --- .../recipes-kernel/linux/linux-yocto_2.6.34.bbappend | 6 ++++++ .../recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 6 ++++++ .../recipes-kernel/linux/linux-yocto_git.bbappend | 3 --- meta-fishriver/conf/machine/fishriver.conf | 6 ------ .../recipes-kernel/linux/linux-yocto-stable_git.bbappend | 5 ----- .../recipes-kernel/linux/linux-yocto_2.6.34.bbappend | 7 +++++++ .../recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 6 ++++++ .../recipes-kernel/linux/linux-yocto_git.bbappend | 3 --- 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 ++++++++ .../recipes-kernel/linux/linux-yocto_git.bbappend | 6 ------ .../recipes-kernel/linux/linux-yocto-stable_git.bbappend | 10 ---------- .../recipes-kernel/linux/linux-yocto_2.6.34.bbappend | 10 ++++++++++ .../recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 10 ++++++++++ meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend | 10 ---------- meta-sugarbay/conf/machine/sugarbay.conf | 3 --- .../recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 7 +++++++ .../recipes-kernel/linux/linux-yocto_git.bbappend | 5 ----- 28 files changed, 94 insertions(+), 97 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 delete mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend delete mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend 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 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 delete mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend delete mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend create mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend delete mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend 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" diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index 8fe9dd31..b0b7d5e7 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf @@ -38,9 +38,3 @@ IMAGE_FSTYPES ?= "ext3 cpio.gz" GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" - -SRCREV_machine_pn-linux-yocto_emenlow = "7dd88fc03db50b131e4a96e6af8036a836ccc300" -SRCREV_meta_pn-linux-yocto_emenlow ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" - -SRCREV_machine_pn-linux-yocto-stable_emenlow = "a29743c0a1398798fbc02c0799c8605d91514e14" -SRCREV_meta_pn-linux-yocto-stable_emenlow ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend deleted file mode 100644 index 77a665d0..00000000 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_emenlow = "emenlow" -KMACHINE_emenlow = "emenlow" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend new file mode 100644 index 00000000..160b3aaf --- /dev/null +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.34.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +COMPATIBLE_MACHINE_emenlow = "emenlow" +KMACHINE_emenlow = "emenlow" + +SRCREV_machine_pn-linux-yocto_emenlow = "a29743c0a1398798fbc02c0799c8605d91514e14" +SRCREV_meta_pn-linux-yocto_emenlow ?= "ec26387cb168e9e0976999b528b5a9dd62e3157a" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..6be0227c --- /dev/null +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_2.6.37.bbappend @@ -0,0 +1,6 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +COMPATIBLE_MACHINE_emenlow = "emenlow" +KMACHINE_emenlow = "yocto/standard/emenlow" + +SRCREV_machine_pn-linux-yocto_emenlow = "7dd88fc03db50b131e4a96e6af8036a836ccc300" +SRCREV_meta_pn-linux-yocto_emenlow ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index 05307b74..00000000 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -COMPATIBLE_MACHINE_emenlow = "emenlow" -KMACHINE_emenlow = "yocto/standard/emenlow" 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" 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" - diff --git a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend deleted file mode 100644 index 18d4999b..00000000 --- a/meta-n450/recipes-kernel/linux/linux-yocto-stable_git.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -KMACHINE_n450 = "atom-pc" -COMPATIBLE_MACHINE_n450 = "n450" - -# The n450 is a single core hypterthreaded CPU -KERNEL_FEATURES_append_n450 += " cfg/smp.scc" - -# We use the atom-pc machine SRCREV and the default meta SRCREV -#SRCREV_machine_pn-linux-yocto-stable_n450 = "" -#SRCREV_meta_pn-linux-yocto-stable_n450 ?= "" diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend new file mode 100644 index 00000000..18d4999b --- /dev/null +++ b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.34.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +KMACHINE_n450 = "atom-pc" +COMPATIBLE_MACHINE_n450 = "n450" + +# The n450 is a single core hypterthreaded CPU +KERNEL_FEATURES_append_n450 += " cfg/smp.scc" + +# We use the atom-pc machine SRCREV and the default meta SRCREV +#SRCREV_machine_pn-linux-yocto-stable_n450 = "" +#SRCREV_meta_pn-linux-yocto-stable_n450 ?= "" diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..d52a90aa --- /dev/null +++ b/meta-n450/recipes-kernel/linux/linux-yocto_2.6.37.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +KMACHINE_n450 = "yocto/standard/common-pc/atom-pc" +COMPATIBLE_MACHINE_n450 = "n450" + +# The n450 is a single core hypterthreaded CPU +KERNEL_FEATURES_append_n450 += " cfg/smp.scc" + +# We use the atom-pc machine SRCREV and the default meta SRCREV +#SRCREV_machine_pn-linux-yocto-stable_n450 = "" +#SRCREV_meta_pn-linux-yocto-stable_n450 ?= "" diff --git a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index d52a90aa..00000000 --- a/meta-n450/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -KMACHINE_n450 = "yocto/standard/common-pc/atom-pc" -COMPATIBLE_MACHINE_n450 = "n450" - -# The n450 is a single core hypterthreaded CPU -KERNEL_FEATURES_append_n450 += " cfg/smp.scc" - -# We use the atom-pc machine SRCREV and the default meta SRCREV -#SRCREV_machine_pn-linux-yocto-stable_n450 = "" -#SRCREV_meta_pn-linux-yocto-stable_n450 ?= "" diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index cca50a97..ebc6dbcc 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf @@ -44,6 +44,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" TARGET_CC_ARCH = "-m64" PREFERRED_VERSION_grub ?= "1.98" - -SRCREV_machine_pn-linux-yocto_sugarbay ?= "5021040d4d881cd0f4a741c6342a290a3af7d021" -SRCREV_meta_pn-linux-yocto_sugarbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..0d5556c6 --- /dev/null +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +COMPATIBLE_MACHINE_sugarbay = "sugarbay" +KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" + +SRCREV_machine_pn-linux-yocto_sugarbay ?= "5021040d4d881cd0f4a741c6342a290a3af7d021" +SRCREV_meta_pn-linux-yocto_sugarbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index 72d00ec4..00000000 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -COMPATIBLE_MACHINE_sugarbay = "sugarbay" -KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" - -- cgit v1.2.3-54-g00ecf