diff options
Diffstat (limited to 'recipes-kernel')
27 files changed, 253 insertions, 413 deletions
diff --git a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch deleted file mode 100644 index 0041af57..00000000 --- a/recipes-kernel/intel-ethernet/ixgbe/0001-ixgbe-skip-host-depmod.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 5f87ef7ed60bc9762467184ed0a6d000b80713d9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: sweeaun <swee.aun.khor@intel.com> | ||
| 3 | Date: Sun, 8 Apr 2018 17:21:52 +0800 | ||
| 4 | Subject: [PATCH] ixgbe: skip host depmod | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [Cross-Compile] | ||
| 7 | |||
| 8 | Depmod during do_install is irrelevant when cross-compiling. | ||
| 9 | Remove the depmod steps during do_install. | ||
| 10 | |||
| 11 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> | ||
| 12 | --- | ||
| 13 | Makefile | 2 -- | ||
| 14 | 1 file changed, 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/Makefile b/Makefile | ||
| 17 | index 545489a..07e422f 100644 | ||
| 18 | --- a/Makefile | ||
| 19 | +++ b/Makefile | ||
| 20 | @@ -141,8 +141,6 @@ install: default manfile | ||
| 21 | @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz | ||
| 22 | @echo "Installing modules..." | ||
| 23 | @+$(call devkernelbuild,modules_install) | ||
| 24 | - @echo "Running depmod..." | ||
| 25 | - @$(call cmd_depmod) | ||
| 26 | |||
| 27 | uninstall: | ||
| 28 | rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko; | ||
| 29 | -- | ||
| 30 | 2.7.4 | ||
| 31 | |||
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb b/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb new file mode 100644 index 00000000..75ebf6f4 --- /dev/null +++ b/recipes-kernel/intel-ethernet/ixgbe_5.20.10.bb | |||
| @@ -0,0 +1,43 @@ | |||
| 1 | SUMMARY = "ixgbe kernel driver for Intel Magnolia Park 10GbE" | ||
| 2 | DESCRIPTION = "The ixgbe driver supports 82598- and 82599-based \ | ||
| 3 | PCI Express* 10 Gigabit Network Connections." | ||
| 4 | |||
| 5 | HOMEPAGE = "https://sourceforge.net/projects/e1000/" | ||
| 6 | SECTION = "kernel/network" | ||
| 7 | LICENSE = "GPL-2.0-only" | ||
| 8 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" | ||
| 9 | |||
| 10 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \ | ||
| 11 | " | ||
| 12 | |||
| 13 | SRC_URI[sha256sum] = "da7e7b62ffb85a820d7541623fbef5c4abef8d1df7ac0af3f1acc3b3d76c9822" | ||
| 14 | |||
| 15 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/" | ||
| 16 | UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/" | ||
| 17 | |||
| 18 | CVE_PRODUCT = "linux:linux_kernel_ixgbe" | ||
| 19 | |||
| 20 | S = "${UNPACKDIR}/${BP}/src" | ||
| 21 | |||
| 22 | EXTRA_OEMAKE = ' KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | ||
| 23 | |||
| 24 | KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbe" | ||
| 25 | KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbe" | ||
| 26 | |||
| 27 | inherit module | ||
| 28 | |||
| 29 | do_install:append () { | ||
| 30 | # Install scripts/set_irq_affinity | ||
| 31 | install -d ${D}${sysconfdir}/network | ||
| 32 | install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network | ||
| 33 | |||
| 34 | rm -rf ${D}${prefix}/man | ||
| 35 | } | ||
| 36 | |||
| 37 | PACKAGES += "${PN}-script" | ||
| 38 | |||
| 39 | FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity" | ||
| 40 | |||
| 41 | EXCLUDE_FROM_WORLD = "1" | ||
| 42 | |||
| 43 | CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1" | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbe_5.6.3.bb b/recipes-kernel/intel-ethernet/ixgbe_5.6.3.bb deleted file mode 100644 index 990d815d..00000000 --- a/recipes-kernel/intel-ethernet/ixgbe_5.6.3.bb +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | SUMMARY="ixgbe kernel driver for Intel Magnolia Park 10GbE" | ||
| 2 | DESCRIPTION="The ixgbe driver supports 82598- and 82599-based \ | ||
| 3 | PCI Express* 10 Gigabit Network Connections." | ||
| 4 | |||
| 5 | HOMEPAGE = "https://sourceforge.net/projects/e1000/" | ||
| 6 | SECTION = "kernel/network" | ||
| 7 | LICENSE = "GPLv2" | ||
| 8 | LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" | ||
| 9 | |||
| 10 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/${PV}/${BP}.tar.gz \ | ||
| 11 | file://0001-ixgbe-skip-host-depmod.patch \ | ||
| 12 | " | ||
| 13 | |||
| 14 | SRC_URI[md5sum] = "990321b97c58b5cbf86e6b1e095d9cbf" | ||
| 15 | SRC_URI[sha256sum] = "d6a5129b7be0a25bed65843be37e4ac913deab4ca169b215521088e10eb03ef1" | ||
| 16 | |||
| 17 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbe%20stable/" | ||
| 18 | UPSTREAM_CHECK_REGEX = "ixgbe%20stable/(?P<pver>\d+(\.\d+)+)/" | ||
| 19 | |||
| 20 | S = "${WORKDIR}/${BP}/src" | ||
| 21 | MODULES_INSTALL_TARGET = "install" | ||
| 22 | |||
| 23 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | ||
| 24 | |||
| 25 | KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbe" | ||
| 26 | KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbe" | ||
| 27 | |||
| 28 | inherit module | ||
| 29 | |||
| 30 | do_install_append () { | ||
| 31 | # Install scripts/set_irq_affinity | ||
| 32 | install -d ${D}${sysconfdir}/network | ||
| 33 | install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network | ||
| 34 | |||
| 35 | rm -rf ${D}${prefix}/man | ||
| 36 | } | ||
| 37 | |||
| 38 | PACKAGES += "${PN}-script" | ||
| 39 | |||
| 40 | FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" | ||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch b/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch deleted file mode 100644 index 656a897d..00000000 --- a/recipes-kernel/intel-ethernet/ixgbevf/0001-ixgbevf-skip-host-depmod.patch +++ /dev/null | |||
| @@ -1,31 +0,0 @@ | |||
| 1 | From 9677d09f5c3984997ac8e7d90b5d4b11fb9ce277 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: sweeaun <swee.aun.khor@intel.com> | ||
| 3 | Date: Sat, 7 Oct 2017 20:56:35 -0700 | ||
| 4 | Subject: [PATCH] ixgbevf: skip host depmod | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [Cross-Compile] | ||
| 7 | |||
| 8 | Depmod during do_install is irrelevant when cross-compiling. | ||
| 9 | Remove the depmod steps during do_install. | ||
| 10 | |||
| 11 | Signed-off-by: sweeaun <swee.aun.khor@intel.com> | ||
| 12 | --- | ||
| 13 | Makefile | 2 -- | ||
| 14 | 1 file changed, 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/Makefile b/Makefile | ||
| 17 | index 91df705..1dcf350 100644 | ||
| 18 | --- a/Makefile | ||
| 19 | +++ b/Makefile | ||
| 20 | @@ -104,8 +104,6 @@ modules_install: default manfile | ||
| 21 | @install -D -m 644 ${DRIVER}.${MANSECTION}.gz ${INSTALL_MOD_PATH}${MANDIR}/man${MANSECTION}/${DRIVER}.${MANSECTION}.gz | ||
| 22 | @echo "Installing modules..." | ||
| 23 | @+$(call kernelbuild,modules_install) | ||
| 24 | - @echo "Running depmod..." | ||
| 25 | - @$(call cmd_depmod) | ||
| 26 | |||
| 27 | uninstall: | ||
| 28 | rm -f ${INSTALL_MOD_PATH}/lib/modules/${KVER}/${INSTALL_MOD_DIR}/${DRIVER}.ko; | ||
| 29 | -- | ||
| 30 | 2.7.4 | ||
| 31 | |||
diff --git a/recipes-kernel/intel-ethernet/ixgbevf_4.6.1.bb b/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb index f73cc37f..8bb0923c 100644 --- a/recipes-kernel/intel-ethernet/ixgbevf_4.6.1.bb +++ b/recipes-kernel/intel-ethernet/ixgbevf_4.19.10.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | SUMMARY="ixgbevf kernel driver for Intel Magnolia Park 10GbE" | 1 | SUMMARY = "ixgbevf kernel driver for Intel Magnolia Park 10GbE" |
| 2 | DESCRIPTION="This virtual function driver supports kernel versions 2.6.x and newer \ | 2 | DESCRIPTION = "This virtual function driver supports kernel versions 2.6.x and newer \ |
| 3 | This driver supports 82599, X540, X550, and X552-based virtual function devices \ | 3 | This driver supports 82599, X540, X550, and X552-based virtual function devices \ |
| 4 | that can only be activated on kernels that support SR-IOV. \ | 4 | that can only be activated on kernels that support SR-IOV. \ |
| 5 | SR-IOV requires the correct platform and OS support. \ | 5 | SR-IOV requires the correct platform and OS support. \ |
| @@ -7,30 +7,29 @@ The guest OS loading this driver must support MSI-X interrupts." | |||
| 7 | 7 | ||
| 8 | HOMEPAGE = "https://sourceforge.net/projects/e1000/" | 8 | HOMEPAGE = "https://sourceforge.net/projects/e1000/" |
| 9 | SECTION = "kernel/network" | 9 | SECTION = "kernel/network" |
| 10 | LICENSE = "GPLv2" | 10 | LICENSE = "GPL-2.0-only" |
| 11 | LIC_FILES_CHKSUM = "file://${WORKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" | 11 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/COPYING;md5=a216b4192dc6b777b6f0db560e9a8417" |
| 12 | 12 | ||
| 13 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ | 13 | SRC_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/${PV}/${BP}.tar.gz \ |
| 14 | file://0001-ixgbevf-skip-host-depmod.patch \ | ||
| 15 | " | 14 | " |
| 16 | 15 | ||
| 17 | SRC_URI[md5sum] = "e98bc636fea13cb62c11433159147851" | 16 | SRC_URI[sha256sum] = "73c6a27be324a48b069dbda0d1d07212a2214c71f54df57bca7177fc92b04881" |
| 18 | SRC_URI[sha256sum] = "2ca0a0a836d006375fa28a999e0b139bda93110a22ee3742ae1c8d0ac9130a41" | ||
| 19 | 17 | ||
| 20 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" | 18 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/" |
| 21 | UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/" | 19 | UPSTREAM_CHECK_REGEX = "ixgbevf%20stable/(?P<pver>\d+(\.\d+)+)/" |
| 22 | 20 | ||
| 23 | S = "${WORKDIR}/${BP}/src" | 21 | CVE_PRODUCT = "linux:linux_kernel_ixgbe" |
| 24 | MODULES_INSTALL_TARGET = "install" | ||
| 25 | 22 | ||
| 26 | EXTRA_OEMAKE='KSRC="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' | 23 | S = "${UNPACKDIR}/${BP}/src" |
| 27 | 24 | ||
| 28 | KERNEL_MODULE_AUTOLOAD_append_intel-core2-32 = " ixgbevf" | 25 | EXTRA_OEMAKE = 'KSRC="${STAGING_KERNEL_DIR}" KOBJ="${STAGING_KERNEL_BUILDDIR}" KVER="${KERNEL_VERSION}" INSTALL_MOD_PATH="${D}"' |
| 29 | KERNEL_MODULE_AUTOLOAD_append_intel-corei7-64 = " ixgbevf" | 26 | |
| 27 | KERNEL_MODULE_AUTOLOAD:append:intel-core2-32 = " ixgbevf" | ||
| 28 | KERNEL_MODULE_AUTOLOAD:append:intel-corei7-64 = " ixgbevf" | ||
| 30 | 29 | ||
| 31 | inherit module | 30 | inherit module |
| 32 | 31 | ||
| 33 | do_install_append () { | 32 | do_install:append () { |
| 34 | # Install scripts/set_irq_affinity | 33 | # Install scripts/set_irq_affinity |
| 35 | install -d ${D}${sysconfdir}/network | 34 | install -d ${D}${sysconfdir}/network |
| 36 | install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network | 35 | install -m 0755 ${S}/../scripts/set_irq_affinity ${D}${sysconfdir}/network |
| @@ -40,4 +39,8 @@ do_install_append () { | |||
| 40 | 39 | ||
| 41 | PACKAGES += "${PN}-script" | 40 | PACKAGES += "${PN}-script" |
| 42 | 41 | ||
| 43 | FILES_${PN}-script += "${sysconfdir}/network/set_irq_affinity" | 42 | FILES:${PN}-script += "${sysconfdir}/network/set_irq_affinity" |
| 43 | |||
| 44 | CVE_STATUS[CVE-2015-1142857] = "fixed-version: Fixed from version 4.4-rc1" | ||
| 45 | |||
| 46 | EXCLUDE_FROM_WORLD = "1" | ||
diff --git a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb index 9eb0a45d..07d2b500 100644 --- a/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb +++ b/recipes-kernel/iwlwifi/backport-iwlwifi_git.bb | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | SUMMARY = "Intel Wireless LinuxCore kernel driver" | 1 | SUMMARY = "Intel Wireless LinuxCore kernel driver" |
| 2 | DESCRIPTION = "Intel Wireless LinuxCore kernel driver" | 2 | DESCRIPTION = "Intel Wireless LinuxCore kernel driver" |
| 3 | SECTION = "kernel" | 3 | SECTION = "kernel" |
| 4 | LICENSE = "GPL-2.0" | 4 | LICENSE = "GPL-2.0-only" |
| 5 | 5 | ||
| 6 | REQUIRED_DISTRO_FEATURES = "wifi" | 6 | REQUIRED_DISTRO_FEATURES = "wifi" |
| 7 | 7 | ||
| 8 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | 8 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
| 9 | 9 | ||
| 10 | inherit module | 10 | inherit module features_check |
| 11 | 11 | ||
| 12 | # For some iwfwifi LinuxCore supported wireless chips, the best/latest | 12 | # For some iwfwifi LinuxCore supported wireless chips, the best/latest |
| 13 | # firmware blobs are found in the iwlwifi's linux-firmware.git fork. | 13 | # firmware blobs are found in the iwlwifi's linux-firmware.git fork. |
| @@ -17,8 +17,8 @@ inherit module | |||
| 17 | # When updating this recipe, ensure that the proper firmware is included from | 17 | # When updating this recipe, ensure that the proper firmware is included from |
| 18 | # either the linux-firmware or iwlwifi-firmware repos. | 18 | # either the linux-firmware or iwlwifi-firmware repos. |
| 19 | 19 | ||
| 20 | PV = "45" | 20 | PV = "96" |
| 21 | SRCREV = "a75c1de6b3fa87885556c67619429cfa87cc048f" | 21 | SRCREV = "d16e74cc1c76ffbfc335153daa86660f199a90da" |
| 22 | 22 | ||
| 23 | SRC_URI = " \ | 23 | SRC_URI = " \ |
| 24 | git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/core${PV} \ | 24 | git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/backport-iwlwifi;branch=release/core${PV} \ |
| @@ -26,7 +26,6 @@ SRC_URI = " \ | |||
| 26 | file://iwlwifi.conf \ | 26 | file://iwlwifi.conf \ |
| 27 | " | 27 | " |
| 28 | 28 | ||
| 29 | S = "${WORKDIR}/git" | ||
| 30 | 29 | ||
| 31 | EXTRA_OEMAKE = "INSTALL_MOD_PATH=${D} KLIB_BUILD=${KBUILD_OUTPUT}" | 30 | EXTRA_OEMAKE = "INSTALL_MOD_PATH=${D} KLIB_BUILD=${KBUILD_OUTPUT}" |
| 32 | 31 | ||
| @@ -34,18 +33,20 @@ do_configure() { | |||
| 34 | CC=gcc CFLAGS= LDFLAGS= make defconfig-iwlwifi-public KLIB_BUILD=${KBUILD_OUTPUT} | 33 | CC=gcc CFLAGS= LDFLAGS= make defconfig-iwlwifi-public KLIB_BUILD=${KBUILD_OUTPUT} |
| 35 | } | 34 | } |
| 36 | 35 | ||
| 37 | MODULES_INSTALL_TARGET="install" | 36 | MODULES_INSTALL_TARGET = "install" |
| 38 | 37 | ||
| 39 | do_install_append() { | 38 | do_install:append() { |
| 40 | ## install configs and service scripts | 39 | ## install configs and service scripts |
| 41 | install -d ${D}${sysconfdir}/modprobe.d | 40 | install -d ${D}${sysconfdir}/modprobe.d |
| 42 | install -m 0644 ${WORKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d | 41 | install -m 0644 ${UNPACKDIR}/iwlwifi.conf ${D}${sysconfdir}/modprobe.d |
| 43 | } | 42 | } |
| 44 | 43 | ||
| 45 | RDEPENDS_${PN} = "linux-firmware-iwlwifi" | 44 | RDEPENDS:${PN} = "linux-firmware-iwlwifi" |
| 46 | 45 | ||
| 47 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | 46 | FILES:${PN} += "${sysconfdir}/modprobe.d/iwlwifi.conf" |
| 48 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | 47 | |
| 48 | KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi" | ||
| 49 | KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi" | ||
| 49 | 50 | ||
| 50 | KERNEL_MODULE_PACKAGE_PREFIX = "backport-iwlwifi" | 51 | KERNEL_MODULE_PACKAGE_PREFIX = "backport-iwlwifi" |
| 51 | 52 | ||
diff --git a/recipes-kernel/linux/linux-intel-dev.bb b/recipes-kernel/linux/linux-intel-dev.bb deleted file mode 100644 index 78d0f85a..00000000 --- a/recipes-kernel/linux/linux-intel-dev.bb +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | require recipes-kernel/linux/linux-yocto.inc | ||
| 2 | require recipes-kernel/linux/meta-intel-compat-kernel.inc | ||
| 3 | |||
| 4 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" | ||
| 5 | |||
| 6 | SRC_URI = " \ | ||
| 7 | git://github.com/intel/mainline-tracking.git;protocol=https;name=machine;nobranch=1; \ | ||
| 8 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA} \ | ||
| 9 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | ||
| 10 | " | ||
| 11 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | ||
| 12 | |||
| 13 | KMETA = "kernel-meta" | ||
| 14 | KCONF_BSP_AUDIT_LEVEL = "2" | ||
| 15 | |||
| 16 | KMETA_BRANCH = "master" | ||
| 17 | |||
| 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
| 19 | |||
| 20 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
| 21 | |||
| 22 | LINUX_VERSION ?= "5.3-rc4" | ||
| 23 | SRCREV_machine ?= "20ac71f22ff4879d30215d9f45594fe70eb984b1" | ||
| 24 | SRCREV_meta ?= "8458df5a288ef0b7efa091556a7612a656898a18" | ||
| 25 | |||
| 26 | LINUX_VERSION_EXTENSION ?= "-mainline-tracking-${LINUX_KERNEL_TYPE}" | ||
| 27 | PV = "${LINUX_VERSION}+git${SRCPV}" | ||
| 28 | |||
| 29 | COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" | ||
| 30 | |||
| 31 | # Functionality flags | ||
| 32 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | ||
| 33 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | ||
| 34 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | ||
diff --git a/recipes-kernel/linux/linux-intel-rt_4.14.bb b/recipes-kernel/linux/linux-intel-rt_4.14.bb deleted file mode 100644 index 552f7800..00000000 --- a/recipes-kernel/linux/linux-intel-rt_4.14.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | require linux-intel.inc | ||
| 2 | |||
| 3 | # Skip processing of this recipe if it is not explicitly specified as the | ||
| 4 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
| 5 | # to build multiple virtual/kernel providers, e.g. as dependency of | ||
| 6 | # core-image-rt-sdk, core-image-rt. | ||
| 7 | python () { | ||
| 8 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": | ||
| 9 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") | ||
| 10 | } | ||
| 11 | |||
| 12 | KBRANCH = "4.14/preempt-rt" | ||
| 13 | KMETA_BRANCH = "yocto-4.14" | ||
| 14 | |||
| 15 | # Fix for 32-bit perf issue. Remove when patch is backported to 4.14. | ||
| 16 | SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch" | ||
| 17 | |||
| 18 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
| 19 | |||
| 20 | LINUX_VERSION ?= "4.14.134" | ||
| 21 | SRCREV_machine ?= "09a421a9b2ba044daf4ab9ea2f54a33cf7a2fac1" | ||
| 22 | SRCREV_meta ?= "bc35d5bd224ab031440a69f9806d839db382f05c" | ||
| 23 | |||
| 24 | LINUX_KERNEL_TYPE = "preempt-rt" | ||
diff --git a/recipes-kernel/linux/linux-intel-rt_4.19.bb b/recipes-kernel/linux/linux-intel-rt_4.19.bb deleted file mode 100644 index a7e272ee..00000000 --- a/recipes-kernel/linux/linux-intel-rt_4.19.bb +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | require linux-intel.inc | ||
| 2 | |||
| 3 | # Skip processing of this recipe if it is not explicitly specified as the | ||
| 4 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
| 5 | # to build multiple virtual/kernel providers, e.g. as dependency of | ||
| 6 | # core-image-rt-sdk, core-image-rt. | ||
| 7 | python () { | ||
| 8 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": | ||
| 9 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") | ||
| 10 | } | ||
| 11 | |||
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
| 13 | SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | ||
| 14 | |||
| 15 | KBRANCH = "4.19/preempt-rt" | ||
| 16 | KMETA_BRANCH = "yocto-4.19" | ||
| 17 | |||
| 18 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
| 19 | |||
| 20 | LINUX_VERSION ?= "4.19.59" | ||
| 21 | SRCREV_machine ?= "d6dc301c71aea6098e5e19ef3f265d0ba9981167" | ||
| 22 | SRCREV_meta ?= "960be4218436fbbb3500e019f7abf02fa94e6aac" | ||
| 23 | |||
| 24 | LINUX_KERNEL_TYPE = "preempt-rt" | ||
diff --git a/recipes-kernel/linux/linux-intel-rt_6.12.bb b/recipes-kernel/linux/linux-intel-rt_6.12.bb new file mode 100644 index 00000000..47dc5cbd --- /dev/null +++ b/recipes-kernel/linux/linux-intel-rt_6.12.bb | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | require linux-intel.inc | ||
| 2 | |||
| 3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
| 4 | " | ||
| 5 | |||
| 6 | # Skip processing of this recipe if it is not explicitly specified as the | ||
| 7 | # PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying | ||
| 8 | # to build multiple virtual/kernel providers, e.g. as dependency of | ||
| 9 | # core-image-rt-sdk, core-image-rt. | ||
| 10 | python () { | ||
| 11 | if d.getVar("KERNEL_PACKAGE_NAME", True) == "kernel" and d.getVar("PREFERRED_PROVIDER_virtual/kernel") != "linux-intel-rt": | ||
| 12 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-intel-rt to enable it") | ||
| 13 | } | ||
| 14 | |||
| 15 | KBRANCH = "6.12/linux" | ||
| 16 | KMETA_BRANCH = "yocto-6.12" | ||
| 17 | |||
| 18 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||
| 19 | |||
| 20 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
| 21 | |||
| 22 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
| 23 | |||
| 24 | LINUX_VERSION ?= "6.12.27" | ||
| 25 | SRCREV_machine ?= "9e2f92c31c6353101755c83670232c94e0c07ddc" | ||
| 26 | SRCREV_meta ?= "da71eb19ceab34a7a6ff4284f1580e043c870168" | ||
| 27 | |||
| 28 | LINUX_KERNEL_TYPE = "preempt-rt" | ||
| 29 | |||
| 30 | # Functionality flags | ||
| 31 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | ||
| 32 | |||
| 33 | UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.12.(\d+)-linux-(\d+)T(\d+)Z)$" | ||
diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index f2ba0d13..c698ae28 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc | |||
| @@ -1,25 +1,22 @@ | |||
| 1 | require recipes-kernel/linux/linux-yocto.inc | 1 | require recipes-kernel/linux/linux-yocto.inc |
| 2 | require recipes-kernel/linux/meta-intel-compat-kernel.inc | 2 | require recipes-kernel/linux/meta-intel-compat-kernel.inc |
| 3 | 3 | ||
| 4 | FILESEXTRAPATHS_prepend := "${THISDIR}/linux-intel:" | 4 | FILESEXTRAPATHS:prepend := "${THISDIR}/linux-intel:" |
| 5 | 5 | ||
| 6 | KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA}" | 6 | KERNEL_CONFIG_URI ?= "git://git.yoctoproject.org/yocto-kernel-cache;protocol=https;type=kmeta;name=meta;branch=${KMETA_BRANCH};destsuffix=${KMETA}" |
| 7 | 7 | ||
| 8 | SRC_URI = " \ | 8 | SRC_URI = " \ |
| 9 | git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
| 10 | ${KERNEL_CONFIG_URI} \ | 9 | ${KERNEL_CONFIG_URI} \ |
| 10 | file://fix-perf-reproducibility.patch \ | ||
| 11 | file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ | ||
| 12 | file://0002-mconf-fix-output-of-cflags-and-libraries.patch \ | ||
| 11 | " | 13 | " |
| 12 | 14 | ||
| 13 | SRC_URI_append_core2-32-intel-common = " file://disable_skylake_sound.cfg" | ||
| 14 | |||
| 15 | LINUX_VERSION_EXTENSION ?= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
| 16 | |||
| 17 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 18 | 16 | ||
| 19 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
| 20 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "0" |
| 21 | 19 | ||
| 22 | COMPATIBLE_MACHINE ?= "(intel-corei7-64|intel-core2-32)" | 20 | COMPATIBLE_MACHINE ?= "(intel-corei7-64)" |
| 23 | 21 | ||
| 24 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 22 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
| 25 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" | ||
diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch deleted file mode 100644 index a9e9213b..00000000 --- a/recipes-kernel/linux/linux-intel/0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch +++ /dev/null | |||
| @@ -1,62 +0,0 @@ | |||
| 1 | From e6ebc8e654bba53f28af5229a1069fc74fa58b7b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jason Wessel <jason.wessel@windriver.com> | ||
| 3 | Date: Thu, 25 Sep 2014 11:26:49 -0700 | ||
| 4 | Subject: [PATCH] menuconfig,check-lxdiaglog.sh: Allow specification of ncurses | ||
| 5 | location | ||
| 6 | |||
| 7 | In some cross build environments such as the Yocto Project build | ||
| 8 | environment it provides an ncurses library that is compiled | ||
| 9 | differently than the host's version. This causes display corruption | ||
| 10 | problems when the host's curses includes are used instead of the | ||
| 11 | includes from the provided compiler are overridden. There is a second | ||
| 12 | case where there is no curses libraries at all on the host system and | ||
| 13 | menuconfig will just fail entirely. | ||
| 14 | |||
| 15 | The solution is simply to allow an override variable in | ||
| 16 | check-lxdialog.sh for environments such as the Yocto Project. Adding | ||
| 17 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing | ||
| 18 | compiling and linking against the right headers and libraries. | ||
| 19 | |||
| 20 | Upstream-Status: submitted [https://lkml.org/lkml/2013/3/3/103] | ||
| 21 | |||
| 22 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
| 23 | cc: Michal Marek <mmarek@suse.cz> | ||
| 24 | cc: linux-kbuild@vger.kernel.org | ||
| 25 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 26 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | ||
| 27 | --- | ||
| 28 | scripts/kconfig/lxdialog/check-lxdialog.sh | 8 ++++++++ | ||
| 29 | 1 file changed, 8 insertions(+) | ||
| 30 | mode change 100755 => 100644 scripts/kconfig/lxdialog/check-lxdialog.sh | ||
| 31 | |||
| 32 | diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh | ||
| 33 | old mode 100755 | ||
| 34 | new mode 100644 | ||
| 35 | index 5075ebf2d3b9..ba9242101190 | ||
| 36 | --- a/scripts/kconfig/lxdialog/check-lxdialog.sh | ||
| 37 | +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh | ||
| 38 | @@ -4,6 +4,10 @@ | ||
| 39 | # What library to link | ||
| 40 | ldflags() | ||
| 41 | { | ||
| 42 | + if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
| 43 | + echo "$CROSS_CURSES_LIB" | ||
| 44 | + exit | ||
| 45 | + fi | ||
| 46 | pkg-config --libs ncursesw 2>/dev/null && exit | ||
| 47 | pkg-config --libs ncurses 2>/dev/null && exit | ||
| 48 | for ext in so a dll.a dylib ; do | ||
| 49 | @@ -21,6 +25,10 @@ ldflags() | ||
| 50 | # Where is ncurses.h? | ||
| 51 | ccflags() | ||
| 52 | { | ||
| 53 | + if [ x"$CROSS_CURSES_INC" != x ]; then | ||
| 54 | + echo "$CROSS_CURSES_INC" | ||
| 55 | + exit | ||
| 56 | + fi | ||
| 57 | if pkg-config --cflags ncursesw 2>/dev/null; then | ||
| 58 | echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1' | ||
| 59 | elif pkg-config --cflags ncurses 2>/dev/null; then | ||
| 60 | -- | ||
| 61 | 2.14.3 | ||
| 62 | |||
diff --git a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch index 3dc71ff2..a601e783 100644 --- a/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ b/recipes-kernel/linux/linux-intel/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | From bebd63730a433ba62549a80114a9851328aa8897 Mon Sep 17 00:00:00 2001 | 1 | From 1811da09f42ca5e82282970e8ad014707bc94c82 Mon Sep 17 00:00:00 2001 |
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> |
| 3 | Date: Mon, 2 Jul 2018 23:10:28 -0400 | 3 | Date: Mon, 2 Jul 2018 23:10:28 -0400 |
| 4 | Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location | 4 | Subject: [PATCH 1/2] menuconfig,mconf-cfg: Allow specification of ncurses |
| 5 | location | ||
| 5 | 6 | ||
| 6 | In some cross build environments such as the Yocto Project build | 7 | In some cross build environments such as the Yocto Project build |
| 7 | environment it provides an ncurses library that is compiled | 8 | environment it provides an ncurses library that is compiled |
| @@ -16,33 +17,36 @@ check-lxdialog.sh for environments such as the Yocto Project. Adding | |||
| 16 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing | 17 | a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing |
| 17 | compiling and linking against the right headers and libraries. | 18 | compiling and linking against the right headers and libraries. |
| 18 | 19 | ||
| 20 | Upstream-Status: Submitted | ||
| 21 | |||
| 19 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | 22 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> |
| 20 | cc: Michal Marek <mmarek@suse.cz> | 23 | cc: Michal Marek <mmarek@suse.cz> |
| 21 | cc: linux-kbuild@vger.kernel.org | 24 | cc: linux-kbuild@vger.kernel.org |
| 22 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 25 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
| 26 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
| 23 | --- | 27 | --- |
| 24 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ | 28 | scripts/kconfig/mconf-cfg.sh | 8 ++++++++ |
| 25 | 1 file changed, 8 insertions(+) | 29 | 1 file changed, 8 insertions(+) |
| 26 | 30 | ||
| 27 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | 31 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh |
| 28 | index c812872d7f9d..42d20819025c 100755 | 32 | index 1e61f50a5905..38cf8304bb31 100755 |
| 29 | --- a/scripts/kconfig/mconf-cfg.sh | 33 | --- a/scripts/kconfig/mconf-cfg.sh |
| 30 | +++ b/scripts/kconfig/mconf-cfg.sh | 34 | +++ b/scripts/kconfig/mconf-cfg.sh |
| 31 | @@ -4,6 +4,14 @@ | 35 | @@ -7,6 +7,14 @@ libs=$2 |
| 32 | PKG="ncursesw" | 36 | PKG="ncursesw" |
| 33 | PKG2="ncurses" | 37 | PKG2="ncurses" |
| 34 | 38 | ||
| 35 | +if [ "$CROSS_CURSES_LIB" != "" ]; then | 39 | +if [ "$CROSS_CURSES_LIB" != "" ]; then |
| 36 | + echo libs=\'$CROSS_CURSES_LIB\' | 40 | + echo libs=\'$CROSS_CURSES_LIB\' |
| 37 | + if [ x"$CROSS_CURSES_INC" != x ]; then | 41 | + if [ x"$CROSS_CURSES_INC" != x ]; then |
| 38 | + echo cflags=\'$CROSS_CURSES_INC\' | 42 | + echo cflags=\'$CROSS_CURSES_INC\' |
| 39 | + fi | 43 | + fi |
| 40 | + exit 0 | 44 | + exit 0 |
| 41 | +fi | 45 | +fi |
| 42 | + | 46 | + |
| 43 | if [ -n "$(command -v pkg-config)" ]; then | 47 | if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then |
| 44 | if pkg-config --exists $PKG; then | 48 | if ${HOSTPKG_CONFIG} --exists $PKG; then |
| 45 | echo cflags=\"$(pkg-config --cflags $PKG)\" | 49 | ${HOSTPKG_CONFIG} --cflags ${PKG} > ${cflags} |
| 46 | -- | 50 | -- |
| 47 | 2.17.1 | 51 | 2.34.1 |
| 48 | 52 | ||
diff --git a/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch b/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch deleted file mode 100644 index 5c8b27c7..00000000 --- a/recipes-kernel/linux/linux-intel/0001-perf-x86-32-explicitly-include-errno.h.patch +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | From 57af599929263e7bb6f2f369c9e4bc1e440528a9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 3 | Date: Mon, 21 Aug 2017 13:52:53 -0400 | ||
| 4 | Subject: [PATCH 1/1] perf: x86-32: explicitly include <errno.h> | ||
| 5 | |||
| 6 | Upstream-Status: submitted | ||
| 7 | |||
| 8 | The 32bit x86 perf build does not find the system definitions of error | ||
| 9 | return values, hence we end up with: | ||
| 10 | |||
| 11 | | In file included from util/libunwind/x86_32.c:32:0: | ||
| 12 | | util/libunwind/../../arch/x86/util/unwind-libunwind.c: In function 'libunwind__x86_reg_id': | ||
| 13 | | util/libunwind/../../arch/x86/util/unwind-libunwind.c:109:11: error: 'EINVAL' undeclared (first use in this function); did you mean 'UNW_EINVAL'? | ||
| 14 | | return -EINVAL; | ||
| 15 | | ^~~~~~ | ||
| 16 | | UNW_EINVAL | ||
| 17 | |||
| 18 | By explicitly including errno.h, we can fix this build without impacting | ||
| 19 | other architectures. | ||
| 20 | |||
| 21 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
| 22 | --- | ||
| 23 | |||
| 24 | tools/perf/util/libunwind/x86_32.c | 1 + | ||
| 25 | 1 file changed, 1 insertion(+) | ||
| 26 | |||
| 27 | diff --git a/tools/perf/util/libunwind/x86_32.c b/tools/perf/util/libunwind/x86_32.c | ||
| 28 | index 957ffff72428..d781f7bdeb88 100644 | ||
| 29 | --- a/tools/perf/util/libunwind/x86_32.c | ||
| 30 | +++ b/tools/perf/util/libunwind/x86_32.c | ||
| 31 | @@ -20,6 +20,7 @@ | ||
| 32 | #define LIBUNWIND__ARCH_REG_IP PERF_REG_X86_IP | ||
| 33 | #define LIBUNWIND__ARCH_REG_SP PERF_REG_X86_SP | ||
| 34 | |||
| 35 | +#include <errno.h> | ||
| 36 | #include "unwind.h" | ||
| 37 | #include "debug.h" | ||
| 38 | #include "libunwind-x86.h" | ||
| 39 | -- | ||
| 40 | 2.14.3 | ||
| 41 | |||
diff --git a/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch new file mode 100644 index 00000000..a96b68d9 --- /dev/null +++ b/recipes-kernel/linux/linux-intel/0002-mconf-fix-output-of-cflags-and-libraries.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From 1b53d82a8152843afcddd7f16b0c43b6b4f22895 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
| 3 | Date: Mon, 17 Jul 2023 17:17:55 -0400 | ||
| 4 | Subject: [PATCH 2/2] mconf: fix output of cflags and libraries | ||
| 5 | |||
| 6 | commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce | ||
| 7 | process forks] changes the way that flags are detected. They are | ||
| 8 | no longer just echo'd and captured, they are written to a file and | ||
| 9 | later read. | ||
| 10 | |||
| 11 | We adjust our CROSS ncurses patch accordingly. | ||
| 12 | |||
| 13 | We'll eventually be able to drop this patch, but not quite yet. | ||
| 14 | |||
| 15 | Upstream-Status: Inappropriate [OE-Specific] | ||
| 16 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
| 17 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
| 18 | --- | ||
| 19 | scripts/kconfig/mconf-cfg.sh | 4 ++-- | ||
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh | ||
| 23 | index 38cf8304bb31..a5ae56e08b07 100755 | ||
| 24 | --- a/scripts/kconfig/mconf-cfg.sh | ||
| 25 | +++ b/scripts/kconfig/mconf-cfg.sh | ||
| 26 | @@ -8,9 +8,9 @@ PKG="ncursesw" | ||
| 27 | PKG2="ncurses" | ||
| 28 | |||
| 29 | if [ "$CROSS_CURSES_LIB" != "" ]; then | ||
| 30 | - echo libs=\'$CROSS_CURSES_LIB\' | ||
| 31 | + echo $CROSS_CURSES_LIB > ${libs} | ||
| 32 | if [ x"$CROSS_CURSES_INC" != x ]; then | ||
| 33 | - echo cflags=\'$CROSS_CURSES_INC\' | ||
| 34 | + echo $CROSS_CURSES_INC > ${cflags} | ||
| 35 | fi | ||
| 36 | exit 0 | ||
| 37 | fi | ||
| 38 | -- | ||
| 39 | 2.34.1 | ||
| 40 | |||
diff --git a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg b/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg deleted file mode 100644 index b38cf6c2..00000000 --- a/recipes-kernel/linux/linux-intel/disable_skylake_sound.cfg +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | # CONFIG_SND_SOC_INTEL_SKYLAKE is not set | ||
| 2 | # CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH is not set | ||
| 3 | # CONFIG_SND_SOC_INTEL_BXT_RT298_MACH is not set | ||
| 4 | # CONFIG_SND_SOC_INTEL_BXT_TDF8532_MACH is not set | ||
| 5 | # CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH is not set | ||
| 6 | # CONFIG_SND_SOC_INTEL_SKL_RT286_MACH is not set | ||
| 7 | # CONFIG_SND_SOC_INTEL_CNL_RT274_MACH is not set | ||
| 8 | # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH is not set | ||
| 9 | # CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH is not set | ||
| 10 | # CONFIG_SND_SOC_INTEL_CNL_CS42L42_MACH is not set | ||
| 11 | # CONFIG_SND_SOC_INTEL_CNL_RT700_MACH is not set | ||
| 12 | # CONFIG_SND_SOC_INTEL_CNL_SVFPGA_MACH is not set | ||
diff --git a/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch new file mode 100644 index 00000000..1a98b1db --- /dev/null +++ b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | From b8cd0e429bf75b673c438a8277d4bc74327df992 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tom Zanussi <tom.zanussi@intel.com> | ||
| 3 | Date: Tue, 3 Jul 2012 13:07:23 -0500 | ||
| 4 | Subject: perf: change --root to --prefix for python install | ||
| 5 | |||
| 6 | Otherwise we get the sysroot path appended to the build path, not what | ||
| 7 | we want. | ||
| 8 | |||
| 9 | Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate | ||
| 12 | |||
| 13 | Taken from linux-yocto, v5.15/standard/base | ||
| 14 | https://git.yoctoproject.org/linux-yocto/commit?id=b8cd0e429bf75b673c438a8277d4bc74327df992&h=v5.15%2Fstandard%2Fbase | ||
| 15 | |||
| 16 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 17 | --- | ||
| 18 | tools/perf/Makefile.perf | 2 +- | ||
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 20 | |||
| 21 | (limited to 'tools/perf/Makefile.perf') | ||
| 22 | |||
| 23 | diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf | ||
| 24 | index 8f738e11356d..ee945d8e3996 100644 | ||
| 25 | --- a/tools/perf/Makefile.perf | ||
| 26 | +++ b/tools/perf/Makefile.perf | ||
| 27 | @@ -1022,7 +1022,7 @@ install-bin: install-tools install-tests install-traceevent-plugins | ||
| 28 | install: install-bin try-install-man | ||
| 29 | |||
| 30 | install-python_ext: | ||
| 31 | - $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)' | ||
| 32 | + $(PYTHON_WORD) util/setup.py --quiet install --prefix='$(DESTDIR_SQ)/usr' | ||
| 33 | |||
| 34 | # 'make install-doc' should call 'make -C Documentation install' | ||
| 35 | $(INSTALL_DOC_TARGETS): | ||
| 36 | -- | ||
| 37 | cgit | ||
| 38 | |||
| 39 | |||
diff --git a/recipes-kernel/linux/linux-intel_4.14.bb b/recipes-kernel/linux/linux-intel_4.14.bb deleted file mode 100644 index e00eb88b..00000000 --- a/recipes-kernel/linux/linux-intel_4.14.bb +++ /dev/null | |||
| @@ -1,22 +0,0 @@ | |||
| 1 | require linux-intel.inc | ||
| 2 | |||
| 3 | KBRANCH = "4.14/base" | ||
| 4 | KMETA_BRANCH = "yocto-4.14" | ||
| 5 | |||
| 6 | # Fix for 32-bit perf issue. Remove when patch is backported to 4.14. | ||
| 7 | SRC_URI_append = " file://0001-perf-x86-32-explicitly-include-errno.h.patch \ | ||
| 8 | file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ | ||
| 9 | " | ||
| 10 | |||
| 11 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
| 12 | |||
| 13 | LINUX_VERSION ?= "4.14.138" | ||
| 14 | SRCREV_machine ?= "3f695bb28f52f6317f034efbf42b052c66dee0e6" | ||
| 15 | SRCREV_meta ?= "bc35d5bd224ab031440a69f9806d839db382f05c" | ||
| 16 | |||
| 17 | # For Crystalforest and Romley | ||
| 18 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
| 19 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
| 20 | |||
| 21 | # Functionality flags | ||
| 22 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | ||
diff --git a/recipes-kernel/linux/linux-intel_4.19.bb b/recipes-kernel/linux/linux-intel_4.19.bb deleted file mode 100644 index ae059b41..00000000 --- a/recipes-kernel/linux/linux-intel_4.19.bb +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | require linux-intel.inc | ||
| 2 | |||
| 3 | KBRANCH = "4.19/base" | ||
| 4 | KMETA_BRANCH = "yocto-4.19" | ||
| 5 | |||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | ||
| 7 | |||
| 8 | SRC_URI_append = " file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch" | ||
| 9 | |||
| 10 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
| 11 | |||
| 12 | LINUX_VERSION ?= "4.19.68" | ||
| 13 | SRCREV_machine ?= "1e852a3597a92ce329cf55a3c86a1c2cae3afc6f" | ||
| 14 | SRCREV_meta ?= "e73568c48e08a0cefa34a689e2f06f60abd17aec" | ||
| 15 | |||
| 16 | # For Crystalforest and Romley | ||
| 17 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | ||
| 18 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | ||
| 19 | |||
| 20 | # Functionality flags | ||
| 21 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/security/security.scc" | ||
diff --git a/recipes-kernel/linux/linux-intel_6.12.bb b/recipes-kernel/linux/linux-intel_6.12.bb new file mode 100644 index 00000000..1ebd7fae --- /dev/null +++ b/recipes-kernel/linux/linux-intel_6.12.bb | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | require linux-intel.inc | ||
| 2 | |||
| 3 | SRC_URI:prepend = "git://github.com/intel/linux-intel-lts.git;protocol=https;name=machine;branch=${KBRANCH}; \ | ||
| 4 | " | ||
| 5 | KBRANCH = "6.12/linux" | ||
| 6 | KMETA_BRANCH = "yocto-6.12" | ||
| 7 | |||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||
| 9 | |||
| 10 | DEPENDS += "elfutils-native openssl-native util-linux-native" | ||
| 11 | |||
| 12 | LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" | ||
| 13 | |||
| 14 | LINUX_VERSION ?= "6.12.27" | ||
| 15 | SRCREV_machine ?= "9e2f92c31c6353101755c83670232c94e0c07ddc" | ||
| 16 | SRCREV_meta ?= "da71eb19ceab34a7a6ff4284f1580e043c870168" | ||
| 17 | |||
| 18 | # Functionality flags | ||
| 19 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc \ | ||
| 20 | features/security/security.scc \ | ||
| 21 | features/intel-npu/intel-npu.scc" | ||
| 22 | |||
| 23 | UPSTREAM_CHECK_GITTAGREGEX = "^lts-(?P<pver>v6.12.(\d+)-linux-(\d+)T(\d+)Z)$" | ||
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index 6173148c..deb19940 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
| @@ -1,21 +1,21 @@ | |||
| 1 | FILESEXTRAPATHS_prepend_intel-x86-common := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS:prepend:intel-x86-common := "${THISDIR}/${PN}:" |
| 2 | 2 | ||
| 3 | COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" | 3 | COMPATIBLE_MACHINE:core2-32-intel-common = "${MACHINE}" |
| 4 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 4 | KMACHINE:core2-32-intel-common = "intel-core2-32" |
| 5 | KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 5 | KERNEL_FEATURES:append:core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 6 | 6 | ||
| 7 | COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" | 7 | COMPATIBLE_MACHINE:corei7-64-intel-common = "${MACHINE}" |
| 8 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 8 | KMACHINE:corei7-64-intel-common = "intel-corei7-64" |
| 9 | KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 9 | KERNEL_FEATURES:append:corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 10 | 10 | ||
| 11 | # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV | 11 | # NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV |
| 12 | # and setting them here breaks the default mechanism to use AUTOREV if the | 12 | # and setting them here breaks the default mechanism to use AUTOREV if the |
| 13 | # default SRCREV is set and linux-yocto-dev is the preferred provider. | 13 | # default SRCREV is set and linux-yocto-dev is the preferred provider. |
| 14 | 14 | ||
| 15 | # For Crystalforest and Romley | 15 | # For Crystalforest and Romley |
| 16 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " uio" | 16 | KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " uio" |
| 17 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " uio" | 17 | KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " uio" |
| 18 | 18 | ||
| 19 | # For FRI2, NUC | 19 | # For FRI2, NUC |
| 20 | KERNEL_MODULE_AUTOLOAD_append_core2-32-intel-common = " iwlwifi" | 20 | KERNEL_MODULE_AUTOLOAD:append:core2-32-intel-common = " iwlwifi" |
| 21 | KERNEL_MODULE_AUTOLOAD_append_corei7-64-intel-common = " iwlwifi" | 21 | KERNEL_MODULE_AUTOLOAD:append:corei7-64-intel-common = " iwlwifi" |
diff --git a/recipes-kernel/linux/linux-yocto-rt_4.19.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend index daa7dd6b..daa7dd6b 100644 --- a/recipes-kernel/linux/linux-yocto-rt_4.19.bbappend +++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend | |||
diff --git a/recipes-kernel/linux/linux-yocto-rt_5.2.bbappend b/recipes-kernel/linux/linux-yocto-rt_5.2.bbappend deleted file mode 100644 index daa7dd6b..00000000 --- a/recipes-kernel/linux/linux-yocto-rt_5.2.bbappend +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | require meta-intel-compat-kernel.inc | ||
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 7c29be14..9f3d43e3 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | require meta-intel-compat-kernel.inc | ||
| 2 | |||
| 1 | # The kernel build is 64-bit regardless, so include both common overrides. | 3 | # The kernel build is 64-bit regardless, so include both common overrides. |
| 2 | # Without this, the kernel will be missing vars that make it buildable for the | 4 | # Without this, the kernel will be missing vars that make it buildable for the |
| 3 | # intel-corei7-64 machine. | 5 | # intel-corei7-64 machine. |
| 4 | MACHINEOVERRIDES_prepend_corei7-64-x32-intel-common = "corei7-64-intel-common:" | 6 | MACHINEOVERRIDES:prepend:corei7-64-x32-intel-common = "corei7-64-intel-common:" |
diff --git a/recipes-kernel/linux/linux-yocto_4.19.bbappend b/recipes-kernel/linux/linux-yocto_4.19.bbappend deleted file mode 100644 index daa7dd6b..00000000 --- a/recipes-kernel/linux/linux-yocto_4.19.bbappend +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | require meta-intel-compat-kernel.inc | ||
diff --git a/recipes-kernel/linux/linux-yocto_5.2.bbappend b/recipes-kernel/linux/linux-yocto_5.2.bbappend deleted file mode 100644 index daa7dd6b..00000000 --- a/recipes-kernel/linux/linux-yocto_5.2.bbappend +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | require meta-intel-compat-kernel.inc | ||
diff --git a/recipes-kernel/linux/meta-intel-compat-kernel.inc b/recipes-kernel/linux/meta-intel-compat-kernel.inc index a985925f..0c861e13 100644 --- a/recipes-kernel/linux/meta-intel-compat-kernel.inc +++ b/recipes-kernel/linux/meta-intel-compat-kernel.inc | |||
| @@ -3,12 +3,12 @@ | |||
| 3 | 3 | ||
| 4 | KERNEL_FEATURES_INTEL_COMMON ?= "" | 4 | KERNEL_FEATURES_INTEL_COMMON ?= "" |
| 5 | 5 | ||
| 6 | COMPATIBLE_MACHINE_intel-x86-common = "${MACHINE}" | 6 | COMPATIBLE_MACHINE:intel-x86-common = "${MACHINE}" |
| 7 | KERNEL_FEATURES_intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" | 7 | KERNEL_FEATURES:intel-x86-common = "${KERNEL_FEATURES_INTEL_COMMON}" |
| 8 | 8 | ||
| 9 | KMACHINE_corei7-64-intel-common = "intel-corei7-64" | 9 | KMACHINE:corei7-64-intel-common = "intel-corei7-64" |
| 10 | KMACHINE_core2-32-intel-common = "intel-core2-32" | 10 | KMACHINE:core2-32-intel-common = "intel-core2-32" |
| 11 | KMACHINE_skylake-64-intel-common = "intel-corei7-64" | 11 | KMACHINE:x86-64-v3-intel-common = "intel-corei7-64" |
| 12 | 12 | ||
| 13 | INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" | 13 | INTEL_COMMON_AUTOLOAD ?= " uio iwlwifi i915" |
| 14 | KERNEL_MODULE_AUTOLOAD_intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" | 14 | KERNEL_MODULE_AUTOLOAD:intel-x86-common = " ${INTEL_COMMON_AUTOLOAD}" |
