From accc04b57bb68da4542bcecd49d95dcb03efd909 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Mon, 31 Mar 2014 16:24:10 +0200 Subject: Revert "linux-yocto: Remove redundant recipes" This commit renders the romley-ivb unbootable. Reverting it is NOT A FIX, it's just a workaround. We should have a proper fix for this at a later time. This reverts commit 09d485dcce6ed4b654abc0c8a630f1d36bc1a7d6. [LXCR-2923] Signed-off-by: Adrian Dudau Signed-off-by: George Nita --- .../recipes-kernel/linux/linux-yocto-dev.bbappend | 8 +------- .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 8 +------- .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 20 ++++++++++++++++++++ .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 16 ++++++++++++++++ .../recipes-kernel/linux/linux-yocto-dev.bbappend | 10 ++++++++++ .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 12 ++++++++++++ .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 21 +++++++++++++++++++++ .../recipes-kernel/linux/linux-yocto-dev.bbappend | 15 +++++++++++++++ .../recipes-kernel/linux/linux-yocto_3.10.bbappend | 13 +++++++++++++ 9 files changed, 109 insertions(+), 14 deletions(-) create mode 100644 meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend create mode 100644 meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend create mode 100644 meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend create mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend create mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend diff --git a/common/recipes-kernel/linux/linux-yocto-dev.bbappend b/common/recipes-kernel/linux/linux-yocto-dev.bbappend index f01933fe..45b6873a 100644 --- a/common/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" +KERNEL_FEATURES_INTEL_COMMON = "" LINUX_VERSION_core2-32-intel-common = "3.14-rc8" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" @@ -17,9 +17,3 @@ SRCREV_machine_corei7-64-intel-common = "fecc3fd7d31bd93766ff4f0431fecdbbfa4c3a7 KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" KBRANCH_intel-corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" - -# For Crystalforest and Romley -module_autoload_uio = "uio" - -# For FRI2 -module_autoload_iwlwifi = "iwlwifi" diff --git a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend index 650919f6..8843e085 100644 --- a/common/recipes-kernel/linux/linux-yocto_3.10.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -KERNEL_FEATURES_INTEL_COMMON += "features/amt/mei/mei.scc" +KERNEL_FEATURES_INTEL_COMMON = "" LINUX_VERSION_core2-32-intel-common = "3.10.33" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" @@ -17,9 +17,3 @@ SRCREV_machine_corei7-64-intel-common = "21df0c8486e129a4087970a07b423c533ae05de KMACHINE_intel-corei7-64-intel-common = "intel-corei7-64" KBRANCH_intel-corei7-64-intel-common = "standard/base" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" - -# For Crystalforest and Romley -module_autoload_uio = "uio" - -# For FRI2 -module_autoload_iwlwifi = "iwlwifi" diff --git a/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..51551ef4 --- /dev/null +++ b/meta-crystalforest/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,20 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + + +COMPATIBLE_MACHINE_crystalforest-gladden = "crystalforest-gladden" +KMACHINE_crystalforest-gladden = "crystalforest" +KBRANCH_crystalforest-gladden = "standard/common-pc-64/crystalforest" + +SRCREV_machine_pn-linux-yocto_crystalforest-gladden ?= "c03195ed6e3066494e3fb4be69154a57066e845b" +SRCREV_meta_pn-linux-yocto_crystalforest-gladden ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" + +COMPATIBLE_MACHINE_crystalforest-server = "crystalforest-server" +KMACHINE_crystalforest-server = "crystalforest" +KBRANCH_crystalforest-server = "standard/common-pc-64/crystalforest" + +SRCREV_machine_pn-linux-yocto_crystalforest-server ?= "a9ec82e355130160f9094e670bd5be0022a84194" +SRCREV_meta_pn-linux-yocto_crystalforest-server ?= "d9cd83c0292bd4e2a6754a96761027252e726a42" + +LINUX_VERSION = "3.10.19" + +module_autoload_uio = "uio" diff --git a/meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..0a12121c --- /dev/null +++ b/meta-isg/meta-haswell-wc/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,16 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +KMETA = "meta" + +COMPATIBLE_MACHINE_haswell-wc = "haswell-wc" +KMACHINE_haswell-wc = "haswell-wc" +KBRANCH_haswell-wc = "standard/common-pc-64/base" + +KERNEL_FEATURES_haswell-wc += "features/amt/mei" + +LINUX_VERSION = "3.10.19" + +SRCREV_machine_haswell-wc = "a9ec82e355130160f9094e670bd5be0022a84194" +SRCREV_meta_haswell-wc = "d9cd83c0292bd4e2a6754a96761027252e726a42" + +SRC_URI_haswell-wc = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta" diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend new file mode 100644 index 00000000..5d6f92fd --- /dev/null +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + + +COMPATIBLE_MACHINE_jasperforest = "jasperforest" + +KMACHINE_jasperforest = "jasperforest" +KBRANCH_jasperforest = "standard/common-pc-64/jasperforest" + +SRCREV_machine_jasperforest = "60536206ad300ccf5b2be2c2d449f4ab27170238" +SRCREV_meta_jasperforest = "fe20c99783387dab779472ff50a88666da1c6391" diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..45ab6b96 --- /dev/null +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + + +COMPATIBLE_MACHINE_jasperforest = "jasperforest" + +KMACHINE_jasperforest = "jasperforest" +KBRANCH_jasperforest = "standard/common-pc-64/jasperforest" + +LINUX_VERSION = "3.10.19" + +SRCREV_meta_jasperforest = "d9cd83c0292bd4e2a6754a96761027252e726a42" +SRCREV_machine_jasperforest = "a9ec82e355130160f9094e670bd5be0022a84194" diff --git a/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..6fc0682d --- /dev/null +++ b/meta-romley/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,21 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + + +COMPATIBLE_MACHINE_romley = "romley" + +KMACHINE_romley = "romley" +KBRANCH_romley = "standard/common-pc-64/romley" + +SRCREV_machine_pn-linux-yocto_romley ?= "c03195ed6e3066494e3fb4be69154a57066e845b" +SRCREV_meta_pn-linux-yocto_romley ?= "f1c9080cd27f99700fa59b5375d1ddd0afe625ad" + +COMPATIBLE_MACHINE_romley-ivb = "romley-ivb" +KMACHINE_romley-ivb = "romley" +KBRANCH_romley-ivb = "standard/common-pc-64/romley" + +SRCREV_machine_pn-linux-yocto_romley-ivb ?= "a9ec82e355130160f9094e670bd5be0022a84194" +SRCREV_meta_pn-linux-yocto_romley-ivb ?= "d9cd83c0292bd4e2a6754a96761027252e726a42" + +LINUX_VERSION = "3.10.19" + +module_autoload_uio = "uio" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend new file mode 100644 index 00000000..f09fbf60 --- /dev/null +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + + +COMPATIBLE_MACHINE_sugarbay = "sugarbay" + +KMACHINE_sugarbay = "sugarbay" +KBRANCH_sugarbay = "standard/common-pc-64/sugarbay" + +LINUX_VERSION = "3.12.0" + +SRCREV_meta_sugarbay = "75feecae0382601045f508bcce104b3d4af1923d" +SRCREV_machine_sugarbay = "1f274173a8335dc27daabd9d9fe2e19a8b3978d1" + +SRCREV_machine_sugarbay = "60536206ad300ccf5b2be2c2d449f4ab27170238" +SRCREV_meta_sugarbay = "fe20c99783387dab779472ff50a88666da1c6391" diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend new file mode 100644 index 00000000..8811fca5 --- /dev/null +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_3.10.bbappend @@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + + +COMPATIBLE_MACHINE_sugarbay = "sugarbay" + +KMACHINE_sugarbay = "sugarbay" +KBRANCH_sugarbay = "standard/common-pc-64/sugarbay" +KERNEL_FEATURES_append_sugarbay = " features/media/media-usb-webcams.scc" + +LINUX_VERSION = "3.10.19" + +SRCREV_meta_sugarbay = "d9cd83c0292bd4e2a6754a96761027252e726a42" +SRCREV_machine_sugarbay = "a9ec82e355130160f9094e670bd5be0022a84194" -- cgit v1.2.3-54-g00ecf