diff options
Diffstat (limited to 'poky/meta/recipes-kernel')
10 files changed, 108 insertions, 35 deletions
diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch b/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch new file mode 100644 index 000000000..6811dfa59 --- /dev/null +++ b/poky/meta/recipes-kernel/kexec/kexec-tools/0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch @@ -0,0 +1,40 @@ +From b54816eff272324320c490d62dc36b27d2838732 Mon Sep 17 00:00:00 2001 +From: Quanyang Wang <quanyang.wang@windriver.com> +Date: Mon, 16 Sep 2019 10:49:05 +0800 +Subject: [PATCH] kexec/arm: undefine __NR_kexec_file_load for arm + +In the kernel upstream commit 4ab65ba7a5cb +("ARM: add kexec_file_load system call number"), +__NR_kexec_file_load for arm has been defined to be 401. +This results that even if kexec_file_load isn't implemented +for arm but the function is_kexec_file_load_implemented() +will still return true. So undef __NR_kexec_file_load for +arm architecture. + +Upstream-Status: Backport +[https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/kexec/kexec-syscall.h?id=b54816eff272324320c490d62dc36b27d2838732] + +Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> +Signed-off-by: Simon Horman <horms@verge.net.au> +--- + kexec/kexec-syscall.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/kexec/kexec-syscall.h b/kexec/kexec-syscall.h +index dac1c1f..92d51d3 100644 +--- a/kexec/kexec-syscall.h ++++ b/kexec/kexec-syscall.h +@@ -56,6 +56,10 @@ + #endif + #endif /*ifndef __NR_kexec_load*/ + ++#ifdef __arm__ ++#undef __NR_kexec_file_load ++#endif ++ + #ifndef __NR_kexec_file_load + + #ifdef __x86_64__ +-- +2.17.1 + diff --git a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb index 343989907..c3f74359f 100644 --- a/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb +++ b/poky/meta/recipes-kernel/kexec/kexec-tools_2.0.19.bb @@ -18,6 +18,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.gz file://0003-kexec-ARM-Fix-add_buffer_phys_virt-align-issue.patch \ file://0004-x86_64-Add-support-to-build-kexec-tools-with-x32-ABI.patch \ file://0005-Disable-PIE-during-link.patch \ + file://0006-kexec-arm-undefine-__NR_kexec_file_load-for-arm.patch \ " SRC_URI[md5sum] = "052458f0a35c2a3b0d2302caa3318e9f" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb index f431f111d..1edcd7eda 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "ca2e3322f4c5678eaef6434c808d0842c805d74d" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine ?= "02f0c38dd20819c0e9d279e3b1e95280101ea8ab" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb index cf5142cf8..6ab1f8d3e 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.2.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "c6eb169e914def00c37cc2917486c637d800d404" -SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" +SRCREV_machine ?= "04d5cfbbd09ba202134f97f8818372c7c9c81fe7" +SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.2.10" +LINUX_VERSION ?= "5.2.17" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb index 2255a7b95..446bce3a8 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.19.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "b5a2efa31290f31384971494031285d394635938" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "283b870cef5f79a6f07465828a51f27a6aed4c50" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb index c2193c0c7..e6eb78198 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.2.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.2.10" +LINUX_VERSION ?= "5.2.17" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "94d03154067049b417526f46429729d4ba1e09b7" -SRCREV_machine ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" -SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" +SRCREV_machine_qemuarm ?= "e31887832108a1dfac19601459a84a2fa38207f7" +SRCREV_machine ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" +SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/poky/meta/recipes-kernel/linux/linux-yocto_4.19.bb index 8f5f711be..96debc42d 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_4.19.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_4.19.bb @@ -11,22 +11,22 @@ KBRANCH_qemux86 ?= "v4.19/standard/base" KBRANCH_qemux86-64 ?= "v4.19/standard/base" KBRANCH_qemumips64 ?= "v4.19/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ca3cb923f8d7962c6d47a8d29923e52da1818854" -SRCREV_machine_qemuarm64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips ?= "f624314048dfac57e47ac91d89ca3dc8395ca47a" -SRCREV_machine_qemuppc ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemux86-64 ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_machine_qemumips64 ?= "ca47368b698795cd5cada84dbfcceda1f47da1aa" -SRCREV_machine ?= "4ec6f255163da37a4c83528e5835b6b9baccee63" -SRCREV_meta ?= "20a6158aa35dbf11819382ef1eeb28915afea765" +SRCREV_machine_qemuarm ?= "b0be447bc9053d07f3438999778bd077679ae756" +SRCREV_machine_qemuarm64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips ?= "3c8b21d0a335b5f418682969448574dfd0011f02" +SRCREV_machine_qemuppc ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemux86-64 ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_machine_qemumips64 ?= "2854797711fee4061fb760c2b6e0e3d3135195ab" +SRCREV_machine ?= "2d7c98a6748a64ca36fd1d2e60c517b16326df61" +SRCREV_meta ?= "a7cb57afb9fb9787079c28a1028d797632105e56" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.19;destsuffix=${KMETA} \ " LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "4.19.61" +LINUX_VERSION ?= "4.19.72" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb index 9a75f1781..49b14b618 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.2.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.2/standard/base" KBRANCH_qemux86-64 ?= "v5.2/standard/base" KBRANCH_qemumips64 ?= "v5.2/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "d329dc7256dfef66dedb604cafea5b5685c57f9d" -SRCREV_machine_qemuarm64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" -SRCREV_machine_qemumips ?= "6a46b8261433131ea99e5725d3fd75969004617c" -SRCREV_machine_qemuppc ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" -SRCREV_machine_qemuriscv64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" -SRCREV_machine_qemux86 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" -SRCREV_machine_qemux86-64 ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" -SRCREV_machine_qemumips64 ?= "06bd563009ffc480befa0d116faed18e63785739" -SRCREV_machine ?= "8d8bf56b2373bfdb1a9702b96a0e91e6706f62d4" -SRCREV_meta ?= "a36c82128d9ccec878d1c0c4542b87d6cf5e9a7c" +SRCREV_machine_qemuarm ?= "d956bb318771761069228fc70fea722ceabecb75" +SRCREV_machine_qemuarm64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" +SRCREV_machine_qemumips ?= "9e95334637a4a85b19bea120f9027ff0028d7069" +SRCREV_machine_qemuppc ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" +SRCREV_machine_qemuriscv64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" +SRCREV_machine_qemux86 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" +SRCREV_machine_qemux86-64 ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" +SRCREV_machine_qemumips64 ?= "29a8d126f60d1b9e9cf0985b38da2033ebde25db" +SRCREV_machine ?= "25b14cdf9659c68ab32d66616dfdbbe2ece3fd94" +SRCREV_meta ?= "56f5bc749e5a8e40b55a3819288ac277813ec5ef" # remap qemuarm to qemuarma15 for the 5.2 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.2;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.2.10" +LINUX_VERSION ?= "5.2.17" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" diff --git a/poky/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch b/poky/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch new file mode 100644 index 000000000..c2028d0e1 --- /dev/null +++ b/poky/meta/recipes-kernel/lttng/lttng-ust/0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch @@ -0,0 +1,31 @@ +From f79dac30af9adda12996da7f6aa6667d3b580537 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 26 Sep 2019 17:54:00 +0800 +Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py + +Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross +building. + +Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + python-lttngust/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/python-lttngust/Makefile.am b/python-lttngust/Makefile.am +index 6c0d20d..38b51b8 100644 +--- a/python-lttngust/Makefile.am ++++ b/python-lttngust/Makefile.am +@@ -9,7 +9,7 @@ install-exec-local: + if [ "$(DESTDIR)" != "" ]; then \ + opts="$$opts --root=$(DESTDIR)"; \ + fi; \ +- $(PYTHON) setup.py install $$opts; ++ $(PYTHON) setup.py install $$opts --install-lib=$(pythondir); + + clean-local: + rm -rf $(builddir)/build +-- +2.7.4 + diff --git a/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb b/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb index e8312afb2..cfaad30b6 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-ust_2.10.5.bb @@ -27,6 +27,7 @@ PE = "2" SRC_URI = "https://lttng.org/files/lttng-ust/lttng-ust-${PV}.tar.bz2 \ file://lttng-ust-doc-examples-disable.patch \ + file://0001-python-lttngust-Makefile.am-Add-install-lib-to-setup.patch \ " SRC_URI[md5sum] = "f0c86a9fa7dcfd0205fb42584a310b1c" |