[ptxdist] [PATCH 1/2] qemu: Version bump. 8.0.4 -> 8.1.0
Bunch of changes. Mostly RISC-V. Pipewire addition.
https://wiki.qemu.org/ChangeLog/8.1
* Plugs CVEs:
CVE-2023-2861, CVE-2023-4135
* Forward patchset with minor line changes.
* Add pipewire support.
* Remove deprecated configure options and set others.
* Disable build system auto-download option.
Signed-off-by: Christian Melki
---
...ow-real-symlinks-for-security_model-mapped-f.patch | 4 ++--
.../0101-let-ninja-use-the-jobserver.patch| 4 ++--
patches/{qemu-8.0.4 => qemu-8.1.0}/series | 0
rules/qemu.in | 7 +++
rules/qemu.make | 11 ++-
5 files changed, 17 insertions(+), 9 deletions(-)
rename patches/{qemu-8.0.4 =>
qemu-8.1.0}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
(97%)
rename patches/{qemu-8.0.4 =>
qemu-8.1.0}/0101-let-ninja-use-the-jobserver.patch (90%)
rename patches/{qemu-8.0.4 => qemu-8.1.0}/series (100%)
diff --git
a/patches/qemu-8.0.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
b/patches/qemu-8.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
similarity index 97%
rename from
patches/qemu-8.0.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
rename to
patches/qemu-8.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
index 15f297782..46b75f8a9 100644
---
a/patches/qemu-8.0.4/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
+++
b/patches/qemu-8.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
@@ -11,7 +11,7 @@ Signed-off-by: Michael Olbrich
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
-index 9d07620235c2..376d5b095c76 100644
+index 1b1f3b9ec81e..d900dccaacb1 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -462,8 +462,7 @@ static ssize_t local_readlink(FsContext *fs_ctx, V9fsPath
*fs_path,
@@ -81,5 +81,5 @@ index 9d07620235c2..376d5b095c76 100644
+goto err_end;
+}
}
- /* Set cleint credentials in symlink's xattr */
+ /* Set client credentials in symlink's xattr */
credp->fc_mode = credp->fc_mode | S_IFLNK;
diff --git a/patches/qemu-8.0.4/0101-let-ninja-use-the-jobserver.patch
b/patches/qemu-8.1.0/0101-let-ninja-use-the-jobserver.patch
similarity index 90%
rename from patches/qemu-8.0.4/0101-let-ninja-use-the-jobserver.patch
rename to patches/qemu-8.1.0/0101-let-ninja-use-the-jobserver.patch
index 92fdb14b6..a1524c1d9 100644
--- a/patches/qemu-8.0.4/0101-let-ninja-use-the-jobserver.patch
+++ b/patches/qemu-8.1.0/0101-let-ninja-use-the-jobserver.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index e421f8a1f4f7..0028d9996cdc 100644
+index 5d48dfac18a3..61a291a95903 100644
--- a/Makefile
+++ b/Makefile
-@@ -145,7 +145,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out
--%,$(MAKEFLAGS
+@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out
--%,$(MAKEFLAGS
MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS
MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
diff --git a/patches/qemu-8.0.4/series b/patches/qemu-8.1.0/series
similarity index 100%
rename from patches/qemu-8.0.4/series
rename to patches/qemu-8.1.0/series
diff --git a/rules/qemu.in b/rules/qemu.in
index 6524013e6..24089c7b5 100644
--- a/rules/qemu.in
+++ b/rules/qemu.in
@@ -17,6 +17,7 @@ menuconfig QEMU
select PIXMAN if QEMU_SYS
select PULSEAUDIO if QEMU_PULSEAUDIO
select ALSA_LIB if QEMU_ALSA
+ select PIPEWIRE if QEMU_PIPEWIRE
help
QEMU is a generic and open source machine emulator and
virtualizer.
@@ -56,6 +57,12 @@ config QEMU_ALSA
help
Say y to build with alsa support.
+config QEMU_PIPEWIRE
+ bool
+ prompt "Enable pipewire audio output support."
+ help
+ Say y to build with pipewire support.
+
config QEMU_TOOLS
bool
prompt "Enable tools"
diff --git a/rules/qemu.make b/rules/qemu.make
index a0039fba4..25d3564f6 100644
--- a/rules/qemu.make
+++ b/rules/qemu.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
#
# Paths and names
#
-QEMU_VERSION := 8.0.4
-QEMU_MD5 := 8f840abde4713da2a50e041cc07a9409
+QEMU_VERSION := 8.1.0
+QEMU_MD5 := 7dd9ff5a92cf81cfce6cda1f6e271f3a
QEMU := qemu-$(QEMU_VERSION)
QEMU_SUFFIX:= tar.xz
QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
@@ -38,6 +38,7 @@ QEMU_USR_TARGETS := $(foreach target, $(QEMU_TARGETS),
$(patsubst %,%-linux-user
QEMU_AUDIO_DRIVER-y:=
QEMU_AUDIO_DRIVER-$(PTXCONF_QEMU_ALSA) += alsa
[ptxdist] [PATCH 2/2] host-qemu: Follow target qemu version 8.1.0 bump.
Signed-off-by: Christian Melki --- rules/host-qemu.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/host-qemu.make b/rules/host-qemu.make index db29c4682..eb60635b0 100644 --- a/rules/host-qemu.make +++ b/rules/host-qemu.make @@ -50,14 +50,13 @@ HOST_QEMU_CONF_OPT := \ $(call ptx/ifdef, PTXCONF_HOST_QEMU_SYS,$(HOST_QEMU_SYS_TARGETS),) \ $(call ptx/ifdef, PTXCONF_HOST_QEMU_USR,$(HOST_QEMU_USR_TARGETS),) \ " \ - --meson=meson \ --ninja=ninja \ - --with-git-submodules=ignore \ + --disable-download \ --disable-sanitizers \ --disable-tsan \ --disable-werror \ --enable-stack-protector \ - --with-coroutine= \ + --with-coroutine=auto \ --disable-plugins \ --disable-containers \ --audio-drv-list= \ @@ -139,6 +138,7 @@ HOST_QEMU_CONF_OPT := \ --disable-opengl \ --disable-oss \ --disable-pa \ + --disable-pipewire \ --disable-parallels \ --disable-png \ --disable-pvrdma \ -- 2.34.1
[ptxdist] [PATCH] host-cmake: Version bump. 3.27.2 -> 3.27.3
Minor changes. https://github.com/Kitware/CMake/compare/v3.27.2...v3.27.3 Signed-off-by: Christian Melki --- rules/host-cmake.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/host-cmake.make b/rules/host-cmake.make index b4c0905b1..535ada4b6 100644 --- a/rules/host-cmake.make +++ b/rules/host-cmake.make @@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake # # Paths and names # -HOST_CMAKE_VERSION := 3.27.2 -HOST_CMAKE_MD5 := 07786cd23c3d0aa9c2fef69efb13662b +HOST_CMAKE_VERSION := 3.27.3 +HOST_CMAKE_MD5 := 7228f5fcc8a858fdeac27e29bda0c144 HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION) HOST_CMAKE_SUFFIX := tar.gz HOST_CMAKE_URL := https://cmake.org/files/v$(basename $(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] batctl: Version bump. 2023.1 -> 2023.2.
No changes. According to the developers empty releases is because they release a set of tools with the same version numbers, regardless. This happens at predetermined intervals afaict. Signed-off-by: Christian Melki --- rules/batctl.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/batctl.make b/rules/batctl.make index 5324131fd..8545e4c05 100644 --- a/rules/batctl.make +++ b/rules/batctl.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BATCTL) += batctl # # Paths and names # -BATCTL_VERSION := 2023.1 -BATCTL_MD5 := 52bb01dc888d003eec3b7a2c74d2153e +BATCTL_VERSION := 2023.2 +BATCTL_MD5 := 629b5dbf4e35253a0db8a65d99eaec57 BATCTL := batctl-$(BATCTL_VERSION) BATCTL_SUFFIX := tar.gz BATCTL_URL := http://downloads.open-mesh.org/batman/stable/sources/batctl/$(BATCTL).$(BATCTL_SUFFIX) -- 2.34.1
[ptxdist] [PATCH] sysklogd: Version bump. 2.5.1 -> 2.5.2
Minor bugfix release. https://github.com/troglobit/sysklogd/releases/tag/v2.5.2 Signed-off-by: Christian Melki --- rules/sysklogd.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sysklogd.make b/rules/sysklogd.make index a985ad60e..91e6ef0b3 100644 --- a/rules/sysklogd.make +++ b/rules/sysklogd.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SYSKLOGD) += sysklogd # # Paths and names # -SYSKLOGD_VERSION := 2.5.1 -SYSKLOGD_MD5 := 8193220708cc348e0cc919227ff0b7fe +SYSKLOGD_VERSION := 2.5.2 +SYSKLOGD_MD5 := 8d731aa7215a899f1070029c9794b423 SYSKLOGD := sysklogd-$(SYSKLOGD_VERSION) SYSKLOGD_SUFFIX:= tar.gz SYSKLOGD_URL := https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION)/$(SYSKLOGD).$(SYSKLOGD_SUFFIX) -- 2.34.1
[ptxdist] [PATCH v2] ptxd_make_fit_image: pad FIT image to block size of 4096 bytes
Trying to flash a FIT image over fastboot often results in errors like
this:
Invalid sparse file format at header magic
error: write_sparse_skip_chunk: don't care size 18394488 is not a multiple
of the block size 4096
error: write_sparse_skip_chunk: don't care size 10009976 is not a multiple
of the block size 4096
error: write_sparse_skip_chunk: don't care size 1625464 is not a multiple
of the block size 4096
[...]
FAILED (remote: 'writing sparse image: Invalid argument')
The FIT image knows about its own size anyway, so to get around this
issue, we can simply pad the image to a multiple of 4 kiB to make it
work with the fastboot sparse magic.
Suggested-by: Ahmad Fatoum
Signed-off-by: Roland Hieber
---
v2: clean up the temp image too
---
scripts/lib/ptxd_make_fit_image.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_fit_image.sh
b/scripts/lib/ptxd_make_fit_image.sh
index dd0f63b7b72d..8162195fdfa3 100644
--- a/scripts/lib/ptxd_make_fit_image.sh
+++ b/scripts/lib/ptxd_make_fit_image.sh
@@ -139,6 +139,8 @@ ptxd_make_image_fit() {
echo "Generated device-tree for the fit image:"
cat "${its}"
fi &&
-ptxd_exec mkimage -N pkcs11 -f "${its}" "${image_image}" -r
"${sign_args[@]}"
+ptxd_exec mkimage -N pkcs11 -f "${its}" "${image_image}.tmp" -r
"${sign_args[@]}" &&
+ptxd_exec dd if="${image_image}.tmp" of="${image_image}" conv=sync bs=4k &&
+ptxd_exec rm "${image_image}.tmp"
}
export -f ptxd_make_image_fit
--
2.39.2
[ptxdist] [PATCH] ptxd_make_fit_image: pad FIT image to block size of 4096 bytes
Trying to flash a FIT image over fastboot often results in errors like
this:
Invalid sparse file format at header magic
error: write_sparse_skip_chunk: don't care size 18394488 is not a multiple
of the block size 4096
error: write_sparse_skip_chunk: don't care size 10009976 is not a multiple
of the block size 4096
error: write_sparse_skip_chunk: don't care size 1625464 is not a multiple
of the block size 4096
[...]
FAILED (remote: 'writing sparse image: Invalid argument')
The FIT image knows about its own size anyway, so to get around this
issue, we can simply pad the image to a multiple of 4 kiB to make it
work with the fastboot sparse magic.
Suggested-by: Ahmad Fatoum
Signed-off-by: Roland Hieber
---
scripts/lib/ptxd_make_fit_image.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/ptxd_make_fit_image.sh
b/scripts/lib/ptxd_make_fit_image.sh
index dd0f63b7b72d..660dd236f241 100644
--- a/scripts/lib/ptxd_make_fit_image.sh
+++ b/scripts/lib/ptxd_make_fit_image.sh
@@ -139,6 +139,7 @@ ptxd_make_image_fit() {
echo "Generated device-tree for the fit image:"
cat "${its}"
fi &&
-ptxd_exec mkimage -N pkcs11 -f "${its}" "${image_image}" -r
"${sign_args[@]}"
+ptxd_exec mkimage -N pkcs11 -f "${its}" "${image_image}.tmp" -r
"${sign_args[@]}" &&
+ptxd_exec dd if="${image_image}.tmp" of="${image_image}" conv=sync bs=4k
}
export -f ptxd_make_image_fit
--
2.39.2
[ptxdist] [PATCH 2/2] kernel: disable jevents support in perf
Signed-off-by: Michael Tretter --- rules/kernel.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/kernel.make b/rules/kernel.make index 17255baae387..59ecdf19973f 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -214,6 +214,7 @@ KERNEL_TOOL_PERF_OPTS := \ NO_SLANG= \ NO_GTK2=1 \ NO_DEMANGLE= \ + NO_JEVENTS=1 \ NO_LIBELF= \ NO_LIBUNWIND=1 \ NO_BACKTRACE= \ -- 2.39.2
[ptxdist] [PATCH 1/2] kernel: don't use libtraceevent for perf
Signed-off-by: Michael Tretter --- rules/kernel.make | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/kernel.make b/rules/kernel.make index e70af54e6137..17255baae387 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -222,6 +222,7 @@ KERNEL_TOOL_PERF_OPTS := \ NO_LIBBIONIC=1 \ NO_LIBCRYPTO=1 \ NO_LIBDW_DWARF_UNWIND= \ + NO_LIBTRACEEVENT=1 \ NO_PERF_READ_VDSO32=1 \ NO_PERF_READ_VDSOX32=1 \ NO_ZLIB= \ -- 2.39.2
