diff options
6 files changed, 40 insertions, 91 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-common_4.4.inc b/common/recipes-kernel/linux/linux-yocto-common_4.4.inc new file mode 100644 index 00000000..6089f7db --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-common_4.4.inc @@ -0,0 +1,25 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +PR := "${INC_PR}.1" + +KMACHINE_amdx86 ?= "common-pc-64" +SRCREV_meta_amdx86 ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa" +LINUX_VERSION_amdx86 ?= "4.4.20" + +SRC_URI_append_amdx86 += " \ + file://linux-yocto-amd-patches.scc \ + file://logo.cfg \ + file://console.cfg \ + file://drm.cfg \ + file://sound.cfg \ + file://hid.cfg \ + file://enable-imc.cfg \ + file://efi-partition.cfg \ + file://usb-serial.cfg \ + file://wifi-drivers.cfg \ + file://disable-intel-graphics.cfg \ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'file://enable-bluetooth.cfg', 'file://disable-bluetooth.cfg', d)} \ + ${@bb.utils.contains('DISTRO', 'mel', 'file://enable-kgdb.cfg', 'file://disable-kgdb.cfg', d)} \ +" + +KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc" diff --git a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend index 8794cb26..63333b20 100644 --- a/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend +++ b/common/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend @@ -1,28 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -PR := "${INC_PR}.1" +require linux-yocto-common_4.4.inc KBRANCH_amdx86 ?= "standard/preempt-rt/base" -KMACHINE_amdx86 ?= "common-pc-64" - SRCREV_machine_amdx86 ?= "76a02384d86df7b7499755f1650b5299740f5473" -SRCREV_meta_amdx86 ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa" -LINUX_VERSION_amdx86 ?= "4.4.20" - -SRC_URI_append_amdx86 += " \ - file://linux-yocto-amd-patches.scc \ - file://logo.cfg \ - file://console.cfg \ - file://drm.cfg \ - file://sound.cfg \ - file://hid.cfg \ - file://enable-imc.cfg \ - file://efi-partition.cfg \ - file://usb-serial.cfg \ - file://wifi-drivers.cfg \ - file://disable-intel-graphics.cfg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'file://enable-bluetooth.cfg', 'file://disable-bluetooth.cfg', d)} \ - ${@bb.utils.contains('DISTRO', 'mel', 'file://enable-kgdb.cfg', 'file://disable-kgdb.cfg', d)} \ -" - -KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc" diff --git a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend index c6956f2e..62fb3dd9 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -1,29 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -PR := "${INC_PR}.1" +require linux-yocto-common_4.4.inc KBRANCH_amdx86 ?= "standard/base" -KMACHINE_amdx86 ?= "common-pc-64" - SRCREV_machine_amdx86 ?= "7d1401a0dd9bebfe49937ca7d9785972e0cc76d0" -SRCREV_meta_amdx86 ?= "e66032e2d93da24c6b9137dbbe66008c77f6d4aa" -LINUX_VERSION_amdx86 ?= "4.4.20" - -SRC_URI_append_amdx86 += " \ - file://linux-yocto-amd-patches.scc \ - file://logo.cfg \ - file://console.cfg \ - file://drm.cfg \ - file://sound.cfg \ - file://hid.cfg \ - file://enable-imc.cfg \ - file://efi-partition.cfg \ - file://usb-serial.cfg \ - file://wifi-drivers.cfg \ - file://disable-intel-graphics.cfg \ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'file://enable-bluetooth.cfg', 'file://disable-bluetooth.cfg', d)} \ - ${@bb.utils.contains('DISTRO', 'mel', 'file://enable-kgdb.cfg', 'file://disable-kgdb.cfg', d)} \ -" SRC_URI_append_radeon += " \ file://radeon-microcode.cfg \ @@ -31,29 +9,4 @@ SRC_URI_append_radeon += " \ file://radeon-gpu-config.cfg \ " -KERNEL_FEATURES_append_amdx86 = " cfg/smp.scc cfg/sound.scc" - -# Drop the keyring fix coming in from mel-updates -# the 4.1.18 kernel has it already. -SRC_URI_remove = "file://kernel-keyring-CVE-2016-0728.patch" - -# strip trailing ';' to workaround bb.fetch.URI bug -python () { - src_uri = d.getVar('SRC_URI', True).split() - d.setVar('SRC_URI', ' '.join(s.rstrip(";") for s in src_uri)) -} - -do_validate_branches_append() { - # Drop a config generating spurious warnings - sed -i '/CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT/d' ${WORKDIR}/${KMETA}/features/i915/i915.cfg -} -# -# Work around race in linux-yocto recipe for archive files. -# This is fixed properly in the master branch with: -# http://patchwork.openembedded.org/patch/107179/ -# -python do_ar_patched_prepend() { - bb.utils.mkdirhier("${STAGING_KERNEL_BUILDDIR}") - bb.utils.mkdirhier("${STAGING_KERNEL_DIR}") -} diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-amdfalconx86_4.4.inc b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-amdfalconx86_4.4.inc new file mode 100644 index 00000000..cabde7a6 --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-amdfalconx86_4.4.inc @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI_append_amdfalconx86 += "file://amdfalconx86-user-features.scc \ + file://amdfalconx86-user-patches.scc \ + file://amdfalconx86.cfg \ + file://amdfalconx86-user-config.cfg \ + file://amdfalconx86-extra-config.cfg \ +" + +COMPATIBLE_MACHINE_amdfalconx86 = "amdfalconx86" diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend index cabde7a6..5b3d5f04 100644 --- a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend +++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto-rt_4.4.bbappend @@ -1,10 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append_amdfalconx86 += "file://amdfalconx86-user-features.scc \ - file://amdfalconx86-user-patches.scc \ - file://amdfalconx86.cfg \ - file://amdfalconx86-user-config.cfg \ - file://amdfalconx86-extra-config.cfg \ -" - -COMPATIBLE_MACHINE_amdfalconx86 = "amdfalconx86" +require linux-yocto-amdfalconx86_4.4.inc diff --git a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto_4.4.bbappend b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto_4.4.bbappend index c8f949b1..5beb27e8 100644 --- a/meta-amdfalconx86/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/meta-amdfalconx86/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -1,11 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +require linux-yocto-amdfalconx86_4.4.inc -SRC_URI_append_amdfalconx86 += "file://amdfalconx86-user-features.scc \ - file://amdfalconx86-user-patches.scc \ - file://amdfalconx86.cfg \ - file://amdfalconx86-user-config.cfg \ - file://amdfalconx86-extra-config.cfg \ - file://amdfalconx86-gpu-config.cfg \ +SRC_URI_append_amdfalconx86 += "file://amdfalconx86-gpu-config.cfg \ file://amdfalconx86-standard-only.cfg \ " -COMPATIBLE_MACHINE_amdfalconx86 = "amdfalconx86" |