diff options
Diffstat (limited to 'poky/meta/recipes-kernel')
18 files changed, 190 insertions, 136 deletions
diff --git a/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb b/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb index c1adbb6245..c541478796 100644 --- a/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb +++ b/poky/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb @@ -6,6 +6,7 @@ DEPENDS += "openssl" SRC_URI += " \ file://0001-Add-the-compile-and-install-rules-for-cryptodev-test.patch \ +file://0001-tests-Makefile-do-not-use-Werror.patch \ " EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"' diff --git a/poky/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch b/poky/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch new file mode 100644 index 0000000000..347a4aef0f --- /dev/null +++ b/poky/meta/recipes-kernel/cryptodev/files/0001-tests-Makefile-do-not-use-Werror.patch @@ -0,0 +1,24 @@ +From e2c2895d52761ddc6384a31364236dd13f677c34 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 10 Sep 2021 10:44:42 +0200 +Subject: [PATCH] tests/Makefile: do not use -Werror + +Otherwise, openssl 3 deprecation warnings become errors. +Reported at https://github.com/cryptodev-linux/cryptodev-linux/issues/67 + +Upstream-Status: Inappropriate [upstream needs to update the code] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + tests/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/Makefile b/tests/Makefile +index 2fb7a9a..e94f80e 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -1,4 +1,4 @@ +-CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall -Werror ++CFLAGS += -I.. $(CRYPTODEV_CFLAGS) -Wall + + comp_progs := cipher_comp hash_comp hmac_comp + diff --git a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20210818.bb b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20210919.bb index 0249332fca..48c01d99fe 100644 --- a/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20210818.bb +++ b/poky/meta/recipes-kernel/linux-firmware/linux-firmware_20210919.bb @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=15ad289bf2359e8ecf613f3b04f72fab \ + file://WHENCE;md5=76f012f7e9b2260d34eccf5726374f08 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "bef3d317c348d962b3a1b95cb4e19ea4f282e18112b2c669cff74f9267ce3893" +SRC_URI[sha256sum] = "2fb22a5d7d23bf1f5800ab8152b39a00a445fbf4923de5a01b59d3f6253f0a9f" inherit allarch diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index f58b5ab0b8..005b688778 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -38,6 +38,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" +DEPENDS += "gmp-native libmpc-native" COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 097dd7b5f9..2795887b92 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "31e2870ebfd892708e8c5f3aced96565e2456ed9" -SRCREV_meta ?= "bce2813b162bb472c137fb503951295a931c25b6" +SRCREV_machine ?= "1d0eb980c3f825c193b07e925090a1a3dd752dbc" +SRCREV_meta ?= "9ff1e75562075e35b5c8649b0a1aece50d8531b7" 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.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.63" +LINUX_VERSION ?= "5.10.75" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb index a147e632e4..e5dc3c30c4 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "7630ebb9fd510cf7aa31b6f1dd472f3b0442afb3" -SRCREV_meta ?= "42d2cf670ed06f4dddd2a035611a519ea68e2d26" +SRCREV_machine ?= "725e45fd0b3b344905a44398b1d7ba64b76c6af2" +SRCREV_meta ?= "11430e73de6cbc577b69ab4844250346146eb3cf" 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.14;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.14.6" +LINUX_VERSION ?= "5.14.14" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 0693a57613..94d0473098 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.63" +LINUX_VERSION ?= "5.10.75" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "96ec3026283d29493f757a077f9c51e6d698c634" -SRCREV_machine ?= "29ff88e6cdf170fbf71e27de32c09e4f6db95078" -SRCREV_meta ?= "bce2813b162bb472c137fb503951295a931c25b6" +SRCREV_machine:qemuarm ?= "773ad5db722c1cbac17a944ab2fd4f1d9d72c55d" +SRCREV_machine ?= "b1ee56b4baf8a85fa02965b76dbc4ba7de898540" +SRCREV_meta ?= "9ff1e75562075e35b5c8649b0a1aece50d8531b7" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb index 20ff40d267..0da8ae5e69 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.14.6" +LINUX_VERSION ?= "5.14.14" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 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 ?= "ee2ccc84e65ade5ba0f8e1a700fba29a755746a1" -SRCREV_machine ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_meta ?= "42d2cf670ed06f4dddd2a035611a519ea68e2d26" +SRCREV_machine:qemuarm ?= "bdbb56b345a04855091cbf667c70d761f417ddff" +SRCREV_machine ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_meta ?= "11430e73de6cbc577b69ab4844250346146eb3cf" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 7c163436fb..e7f8cc188f 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.10/standard/base" KBRANCH:qemux86-64 ?= "v5.10/standard/base" KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "36e0cc294f77cf72b01a1f9ea62bb13d1ab0693e" -SRCREV_machine:qemuarm64 ?= "a1c9c936088b6cf4ec56f5180672d6f0e8e3b955" -SRCREV_machine:qemumips ?= "4962920baaee3235448b48e992a3da0259dcfa57" -SRCREV_machine:qemuppc ?= "57b30ad7f8a6c3be0ad8eac742476da3f97c23f3" -SRCREV_machine:qemuriscv64 ?= "164ed895bc1e94722e80fe6496b176f6bb815cd4" -SRCREV_machine:qemuriscv32 ?= "164ed895bc1e94722e80fe6496b176f6bb815cd4" -SRCREV_machine:qemux86 ?= "164ed895bc1e94722e80fe6496b176f6bb815cd4" -SRCREV_machine:qemux86-64 ?= "164ed895bc1e94722e80fe6496b176f6bb815cd4" -SRCREV_machine:qemumips64 ?= "a615aa60bc10bea5262f2d65da7ddff4ba32146e" -SRCREV_machine ?= "164ed895bc1e94722e80fe6496b176f6bb815cd4" -SRCREV_meta ?= "bce2813b162bb472c137fb503951295a931c25b6" +SRCREV_machine:qemuarm ?= "eaf94169288a0cdaa7f919e81b9cde11637328a0" +SRCREV_machine:qemuarm64 ?= "0a2409ae4ca5c3efc6633891d807c189f8c2e6ec" +SRCREV_machine:qemumips ?= "73ca3b526488435d4f2a404642078b3b111879af" +SRCREV_machine:qemuppc ?= "14edaae440f2835071ffacced9f240cdd8cf7094" +SRCREV_machine:qemuriscv64 ?= "97699547a2625645320510db2237e8619a7954ef" +SRCREV_machine:qemuriscv32 ?= "97699547a2625645320510db2237e8619a7954ef" +SRCREV_machine:qemux86 ?= "97699547a2625645320510db2237e8619a7954ef" +SRCREV_machine:qemux86-64 ?= "97699547a2625645320510db2237e8619a7954ef" +SRCREV_machine:qemumips64 ?= "9e86c3417c2c6a61a52664ebcfdd541f6af7e099" +SRCREV_machine ?= "97699547a2625645320510db2237e8619a7954ef" +SRCREV_meta ?= "9ff1e75562075e35b5c8649b0a1aece50d8531b7" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE:qemuarm ?= "qemuarma15" @@ -32,7 +32,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.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.63" +LINUX_VERSION ?= "5.10.75" 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.14.bb b/poky/meta/recipes-kernel/linux/linux-yocto_5.14.bb index 0c6fbff75e..ed20557183 100644 --- a/poky/meta/recipes-kernel/linux/linux-yocto_5.14.bb +++ b/poky/meta/recipes-kernel/linux/linux-yocto_5.14.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.14/standard/base" KBRANCH:qemux86-64 ?= "v5.14/standard/base" KBRANCH:qemumips64 ?= "v5.14/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "8226a3a65df2dbae0fe71e9ff54cba70a9ba85e5" -SRCREV_machine:qemuarm64 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_machine:qemumips ?= "b5389debd85300e24b877f25c2e90381f1df7678" -SRCREV_machine:qemuppc ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_machine:qemuriscv64 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_machine:qemuriscv32 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_machine:qemux86 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_machine:qemux86-64 ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_machine:qemumips64 ?= "56cc67b699194944809832f4c8f58b9828f02bf9" -SRCREV_machine ?= "7ae156be3bdbf033839f7f3ec2e9a0ffffb18818" -SRCREV_meta ?= "42d2cf670ed06f4dddd2a035611a519ea68e2d26" +SRCREV_machine:qemuarm ?= "3e04a89e8e89fe2f799cd201f6994ff515ca95c1" +SRCREV_machine:qemuarm64 ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_machine:qemumips ?= "566b7915f715e00e4ebb2a4121239de4cb1f33b5" +SRCREV_machine:qemuppc ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_machine:qemuriscv64 ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_machine:qemuriscv32 ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_machine:qemux86 ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_machine:qemux86-64 ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_machine:qemumips64 ?= "13d9e1b6481efec1e72733134e83b981e0adf6bb" +SRCREV_machine ?= "28c011f5b095822798d2a8320f104abc0fc216cd" +SRCREV_meta ?= "11430e73de6cbc577b69ab4844250346146eb3cf" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same @@ -31,7 +31,7 @@ SRCREV_meta ?= "42d2cf670ed06f4dddd2a035611a519ea68e2d26" # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" DEFAULT_PREFERENCE:class-devupstream = "-1" -SRCREV_machine:class-devupstream ?= "6a7ababc0268063d0798c46d5859a90ee996612f" +SRCREV_machine:class-devupstream ?= "fe024e004fa31dc64d18440c006b02cd8d722a03" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.14/base" @@ -42,11 +42,11 @@ 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.14;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.14.6" +LINUX_VERSION ?= "5.14.14" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" -DEPENDS += "gmp-native" +DEPENDS += "gmp-native libmpc-native" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch b/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch deleted file mode 100644 index c4cac9cc58..0000000000 --- a/poky/meta/recipes-kernel/lttng/lttng-tools/0001-tests-wait-some-more-before-analysing-traces-or-star.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 8d9daede0882d239b0a47b0f7a6db68ba4934a7d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Sat, 4 Sep 2021 13:57:39 +0200 -Subject: [PATCH] tests: wait some more before analysing traces or starting - tracing - -Otherwise, there are sporadic race failures where lttng tracing -is stopped before all expected events are collected or is started too soon, e.g.: - -PASS: tools/tracker/test_event_tracker 205 - Traced application stopped. -PASS: tools/tracker/test_event_tracker 206 - Stop lttng tracing for session -PASS: tools/tracker/test_event_tracker 207 - Destroy session tracker -FAIL: tools/tracker/test_event_tracker 208 - Validate empty trace - -PASS: ust/namespaces/test_ns_contexts_change 42 - Stop lttng tracing for session mnt_ns -PASS: ust/namespaces/test_ns_contexts_change 43 - Destroy session mnt_ns -PASS: ust/namespaces/test_ns_contexts_change 44 - Wait after kill session daemon -PASS: ust/namespaces/test_ns_contexts_change 45 - Validate trace for event mnt_ns = 4026531840, 1000 events -PASS: ust/namespaces/test_ns_contexts_change 46 - Read a total of 1000 events, expected 1000 -PASS: ust/namespaces/test_ns_contexts_change 47 - Validate trace for event mnt_ns = 4026532303, 233 events -FAIL: ust/namespaces/test_ns_contexts_change 48 - Read a total of 233 events, expected 1000 - -This is a hack; issue should be fixed upstream with explicit syncs. -It has been reported here: https://bugs.lttng.org/issues/1217 - -Upstream-Status: Inappropriate [needs a real fix] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - tests/regression/tools/tracker/test_event_tracker | 8 ++++++++ - tests/regression/ust/namespaces/test_ns_contexts_change | 2 ++ - 2 files changed, 10 insertions(+) - -diff --git a/tests/regression/tools/tracker/test_event_tracker b/tests/regression/tools/tracker/test_event_tracker -index feb3787..a0f2257 100755 ---- a/tests/regression/tools/tracker/test_event_tracker -+++ b/tests/regression/tools/tracker/test_event_tracker -@@ -130,6 +130,8 @@ function test_event_vpid_tracker() - - prepare_"$domain"_app - -+sleep 5 -+ - start_lttng_tracing_ok - - if [ "$expect_event" -eq 1 ]; then -@@ -173,6 +175,8 @@ function test_event_pid_tracker() - - prepare_"$domain"_app - -+sleep 5 -+ - start_lttng_tracing_ok - - if [ "$expect_event" -eq 1 ]; then -@@ -275,6 +279,8 @@ function test_event_vpid_track_untrack() - - prepare_"$domain"_app - -+sleep 5 -+ - start_lttng_tracing_ok - - lttng_track_"$domain"_ok "--vpid ${CHILD_PID}" -@@ -315,6 +321,8 @@ function test_event_pid_track_untrack() - - prepare_"$domain"_app - -+sleep 5 -+ - start_lttng_tracing_ok - - lttng_track_"$domain"_ok "--pid ${CHILD_PID}" -diff --git a/tests/regression/ust/namespaces/test_ns_contexts_change b/tests/regression/ust/namespaces/test_ns_contexts_change -index c0af15e..b111bfe 100755 ---- a/tests/regression/ust/namespaces/test_ns_contexts_change -+++ b/tests/regression/ust/namespaces/test_ns_contexts_change -@@ -79,6 +79,8 @@ function test_ns() - - touch "$file_sync_before_last" - -+sleep 5 -+ - # stop and destroy - stop_lttng_tracing_ok "$session_name" - destroy_lttng_session_ok "$session_name" --- -2.20.1 - diff --git a/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb b/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb index 47cab42fcf..063d8e8c2d 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.0.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-tools_2.13.1.bb @@ -37,10 +37,9 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ file://lttng-sessiond.service \ file://determinism.patch \ file://0001-src-common-correct-header-location.patch \ - file://0001-tests-wait-some-more-before-analysing-traces-or-star.patch \ " -SRC_URI[sha256sum] = "8dc894f9a7a840e943c1c344345c75f001a9529daa9157f1a0e6175c081c29e6" +SRC_URI[sha256sum] = "cfe6df7da831fc07fd07ce46b442c2ec1074c167af73f3a1b1d2fba0c453c8b5" inherit autotools ptest pkgconfig useradd python3-dir manpages systemd diff --git a/poky/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb b/poky/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb index 4ec92c0683..7c6a0743e1 100644 --- a/poky/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb +++ b/poky/meta/recipes-kernel/lttng/lttng-ust_2.13.0.bb @@ -16,6 +16,7 @@ inherit autotools lib_package manpages python3native pkgconfig include lttng-platforms.inc EXTRA_OECONF = "--disable-numa" +CPPFLAGS:append:arm = "${@oe.utils.vartrue('DEBUG_BUILD', '-DUATOMIC_NO_LINK_ERROR', '', d)}" DEPENDS = "liburcu util-linux" RDEPENDS:${PN}-bin = "python3-core" diff --git a/poky/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch b/poky/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch new file mode 100644 index 0000000000..84b05ac971 --- /dev/null +++ b/poky/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch @@ -0,0 +1,52 @@ +From 76d3f0851520bc8488e432f423941f1e72cc7405 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 25 Oct 2021 17:47:23 +0200 +Subject: [PATCH] src: fix compatibility with ncurses 6.3 + +Upstream-Status: Submitted [https://github.com/fenrus75/powertop/pull/92] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + src/devices/devfreq.cpp | 2 +- + src/display.cpp | 2 +- + src/lib.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp +index 0509d0f..b194ac4 100644 +--- a/src/devices/devfreq.cpp ++++ b/src/devices/devfreq.cpp +@@ -297,7 +297,7 @@ void display_devfreq_devices(void) + df->fill_freq_utilization(j, buf); + strcat(fline, buf); + strcat(fline, "\n"); +- wprintw(win, fline); ++ wprintw(win, "%s", fline); + } + wprintw(win, "\n"); + } +diff --git a/src/display.cpp b/src/display.cpp +index 7131144..cc03919 100644 +--- a/src/display.cpp ++++ b/src/display.cpp +@@ -125,7 +125,7 @@ void show_tab(unsigned int tab) + + c = bottom_lines[tab_names[tab]].c_str(); + if (c && strlen(c) > 0) +- mvwprintw(bottom_line, 0,0, c); ++ mvwprintw(bottom_line, 0,0, "%s", c); + else + mvwprintw(bottom_line, 0, 0, + "<ESC> %s | <TAB> / <Shift + TAB> %s | ", _("Exit"), +diff --git a/src/lib.cpp b/src/lib.cpp +index 5e48f37..5cd1c4a 100644 +--- a/src/lib.cpp ++++ b/src/lib.cpp +@@ -583,7 +583,7 @@ void ui_notify_user_ncurses(const char *frmt, ...) + * buffer */ + vsnprintf(notify, UI_NOTIFY_BUFF_SZ - 1, frmt, list); + va_end(list); +- mvprintw(1, 0, notify); ++ mvprintw(1, 0, "%s", notify); + attroff(COLOR_PAIR(1)); + } + diff --git a/poky/meta/recipes-kernel/powertop/powertop_2.14.bb b/poky/meta/recipes-kernel/powertop/powertop_2.14.bb index c176cba388..3a7c3ba31e 100644 --- a/poky/meta/recipes-kernel/powertop/powertop_2.14.bb +++ b/poky/meta/recipes-kernel/powertop/powertop_2.14.bb @@ -7,8 +7,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" SRC_URI = "git://github.com/fenrus75/powertop;protocol=https \ - file://0001-wakeup_xxx.h-include-limits.h.patch \ -" + file://0001-wakeup_xxx.h-include-limits.h.patch \ + file://0001-src-fix-compatibility-with-ncurses-6.3.patch \ + " SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch b/poky/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch new file mode 100644 index 0000000000..b53e107d84 --- /dev/null +++ b/poky/meta/recipes-kernel/systemtap/systemtap/0001-staprun-address-ncurses-6.3-failures.patch @@ -0,0 +1,61 @@ +From 191f528da19193d713d94ee252e2485efd9af4d3 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Mon, 25 Oct 2021 17:59:24 +0200 +Subject: [PATCH] staprun: address ncurses 6.3 failures + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + staprun/monitor.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/staprun/monitor.c b/staprun/monitor.c +index 478634c09..f4fbfd686 100644 +--- a/staprun/monitor.c ++++ b/staprun/monitor.c +@@ -448,12 +448,12 @@ void monitor_render(void) + if (active_window == 0) + wattron(status, A_BOLD); + wprintw(status, "\n%*s\t%*s\t%*s\t%*s\t%*s\t%*s\t%s\n", +- width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), +- width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), +- width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), +- width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), +- width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), +- width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), ++ (int)width[p_index], HIGHLIGHT("index", p_index, comp_fn_index), ++ (int)width[p_state], HIGHLIGHT("state", p_state, comp_fn_index), ++ (int)width[p_hits], HIGHLIGHT("hits", p_hits, comp_fn_index), ++ (int)width[p_min], HIGHLIGHT("min", p_min, comp_fn_index), ++ (int)width[p_avg], HIGHLIGHT("avg", p_avg, comp_fn_index), ++ (int)width[p_max], HIGHLIGHT("max", p_max, comp_fn_index), + HIGHLIGHT("name", p_name, comp_fn_index)); + if (active_window == 0) + wattroff(status, A_BOLD); +@@ -466,17 +466,17 @@ void monitor_render(void) + json_object *probe, *field; + probe = json_object_array_get_idx(jso_probe_list, i); + json_object_object_get_ex(probe, "index", &field); +- wprintw(status, "%*s\t", width[p_index], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int)width[p_index], json_object_get_string(field)); + json_object_object_get_ex(probe, "state", &field); +- wprintw(status, "%*s\t", width[p_state], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int)width[p_state], json_object_get_string(field)); + json_object_object_get_ex(probe, "hits", &field); +- wprintw(status, "%*s\t", width[p_hits], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int)width[p_hits], json_object_get_string(field)); + json_object_object_get_ex(probe, "min", &field); +- wprintw(status, "%*s\t", width[p_min], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int)width[p_min], json_object_get_string(field)); + json_object_object_get_ex(probe, "avg", &field); +- wprintw(status, "%*s\t", width[p_avg], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int)width[p_avg], json_object_get_string(field)); + json_object_object_get_ex(probe, "max", &field); +- wprintw(status, "%*s\t", width[p_max], json_object_get_string(field)); ++ wprintw(status, "%*s\t", (int)width[p_max], json_object_get_string(field)); + getyx(status, discard, cur_x); + json_object_object_get_ex(probe, "name", &field); + wprintw(status, "%.*s", max_cols-cur_x-1, json_object_get_string(field)); +-- +2.20.1 + diff --git a/poky/meta/recipes-kernel/systemtap/systemtap_git.bb b/poky/meta/recipes-kernel/systemtap/systemtap_git.bb index 8f0de5f0f0..d11d9b93a2 100644 --- a/poky/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/poky/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -6,7 +6,9 @@ HOMEPAGE = "https://sourceware.org/systemtap/" require systemtap_git.inc -SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch" +SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch \ + file://0001-staprun-address-ncurses-6.3-failures.patch \ + " DEPENDS = "elfutils" diff --git a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.07.14.bb b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb index a396f15c55..c673f8044c 100644 --- a/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.07.14.bb +++ b/poky/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.08.28.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "2e2dd216a5f1a310b849774af63e6309d94c2207c34771a534c47ae18b162742" +SRC_URI[sha256sum] = "cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446" inherit bin_package allarch |