linux-yocto/5.15: fix qemuarm graphical boot
PATCH 1/1 linux-yocto/5.15: fix qemuarm graphical boot
From: Bruce Ashfield <[email protected]>
During the cleanup/refactoring of qemuarm* we dropped a PCI option that is required for graphical boot. The configuration is fixed to create a separate fragment, which just enabled the minimim and we include it into qemuarma15 standard/preempt-rt.
Integrating the following commit(s) to linux-yocto/5.15:
fcf48627ea5 qemuarma15: include pci-of-generic support
--- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +1 -1
@@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "2b74bd6a3a2341f079f914171bc92eadc8a7deaa" -SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" +SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" 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.15;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +1 -1
@@ -15,7 +15,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "9107fb1e04c2da3d84e1967aeb7f5bc190423d5b" -SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" +SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.15.bb +1 -1
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" SRCREV_machine:qemux86-64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" SRCREV_machine:qemumips64 ?= "1822ceafc13337881a81edeb7093b0c095d9efca" SRCREV_machine ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" -SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" +SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" # 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
Signature · 1 line
2.19.1
PATCH 1/1 strace: fix ptest failure in landlock
From: Bruce Ashfield <[email protected]>
Kernel commit:
commit 3d4b396a616d0d67bf95d6823ad1197f6247292e
Author: Christian Brauner <[email protected]>
Date: Mon Oct 11 15:37:04 2021 +0200
landlock: Use square brackets around "landlock-ruleset"
commit aea0b9f2486da8497f35c7114b764bf55e17c7ea upstream.
Make the name of the anon inode fd "[landlock-ruleset]" instead of "landlock-ruleset". This is minor but most anon inode fds already carry square brackets around their name:
[eventfd]
[eventpoll]
[fanotify]
[fscontext]
[io_uring]
[pidfd]
[signalfd]
[timerfd]
[userfaultfd]
For the sake of consistency lets do the same for the landlock-ruleset anon inode fd that comes with landlock. We did the same in 1cdc415f1083 ("uapi, fsopen: use square brackets around "fscontext" [ver #2]") for the new mount api.
Changed the format of the landlock tracing. We need to update the strace expected string to match.
Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2022-April/011064.html]
--- ...0001-landlock-update-expected-string.patch | 67 +++++++++++++++++++ meta/recipes-devtools/strace/strace_5.17.bb | 1 + 2 files changed, 68 insertions(+) create mode 100644 meta/recipes-devtools/strace/strace/0001-landlock-update-expected-string.patch
meta/recipes-devtools/strace/strace/0001-landlock-update-expected-string.patch new file +67 -0
@@ -0,0 +1,67 @@ +From d0dae2fb30b907bc9bf70382f37c9e00207ae036 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <[email protected]> +Date: Sat, 30 Apr 2022 01:09:42 -0400 +Subject: [PATCH] landlock: update expected string +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Kernel commit: + + commit 3d4b396a616d0d67bf95d6823ad1197f6247292e + Author: Christian Brauner <[email protected]> + Date: Mon Oct 11 15:37:04 2021 +0200 + + landlock: Use square brackets around "landlock-ruleset" + + commit aea0b9f2486da8497f35c7114b764bf55e17c7ea upstream. + + Make the name of the anon inode fd "[landlock-ruleset]" instead of + "landlock-ruleset". This is minor but most anon inode fds already + carry square brackets around their name: + + [eventfd] + [eventpoll] + [fanotify] + [fscontext] + [io_uring] + [pidfd] + [signalfd] + [timerfd] + [userfaultfd] + + For the sake of consistency lets do the same for the landlock-ruleset anon + inode fd that comes with landlock. We did the same in + 1cdc415f1083 ("uapi, fsopen: use square brackets around "fscontext" [ver #2]") + for the new mount api. + + Cc: [email protected] + Signed-off-by: Christian Brauner <[email protected]> + Link: https://lore.kernel.org/r/[email protected] + Cc: [email protected] + Signed-off-by: Mickaël Salaün <[email protected]> + Signed-off-by: Greg Kroah-Hartman <[email protected]> + +Changed the format of the landlock tracing. We need to update the strace +expected string to match. + +Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2022-April/011064.html] + +Signed-off-by: Bruce Ashfield <[email protected]> +--- + tests/landlock_create_ruleset-y.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/landlock_create_ruleset-y.c b/tests/landlock_create_ruleset-y.c +index a30966b..50e19c2 100644 +--- a/tests/landlock_create_ruleset-y.c ++++ b/tests/landlock_create_ruleset-y.c +@@ -1,4 +1,4 @@ +-#define FD_PATH "<anon_inode:landlock-ruleset>" ++#define FD_PATH "<anon_inode:[landlock-ruleset]>" + #define SKIP_IF_PROC_IS_UNAVAILABLE skip_if_unavailable("/proc/self/fd/") + + #include "landlock_create_ruleset.c" +-- +2.19.1 +
meta/recipes-devtools/strace/strace_5.17.bb +1 -0
@@ -13,6 +13,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://ptest-spacesave.patch \ file://0001-strace-fix-reproducibilty-issues.patch \ file://skip-load.patch \ + file://0001-landlock-update-expected-string.patch \ " SRC_URI[sha256sum] = "5fb298dbd1331fd1e1bc94c5c32395860d376101b87c6cd3d1ba9f9aa15c161f"
Signature · 1 line
2.19.1