* [PR PATCH] qemu: update to 9.2.0.
@ 2024-12-13 18:57 classabbyamp
2024-12-15 18:35 ` [PR PATCH] [Updated] " classabbyamp
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: classabbyamp @ 2024-12-13 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu
https://github.com/void-linux/void-packages/pull/53509
qemu: update to 9.2.0.
- **qemu-user: update to 9.2.0.**
- **qemu: update to 9.2.0.**
- **removed-packages: update to 0.1.20241213.**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **in progress**
A patch file from https://github.com/void-linux/void-packages/pull/53509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-53509.patch --]
[-- Type: text/x-diff, Size: 13338 bytes --]
From ca7ea720a66731e908949a1d61e7551138c05e1c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:08 -0500
Subject: [PATCH 1/3] qemu-user: update to 9.2.0.
---
srcpkgs/qemu-user-cris | 1 -
srcpkgs/qemu-user/template | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
delete mode 120000 srcpkgs/qemu-user-cris
diff --git a/srcpkgs/qemu-user-cris b/srcpkgs/qemu-user-cris
deleted file mode 120000
index 62973fbc0559e9..00000000000000
--- a/srcpkgs/qemu-user-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu-user
\ No newline at end of file
diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template
index eaa6beeb687081..b8222ea544180c 100644
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@@ -1,7 +1,7 @@
# Template file for 'qemu-user'
# This package should be updated together with qemu
pkgname=qemu-user
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -15,7 +15,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
subpackages="qemu-user-static"
if [ "$CROSS_BUILD" ]; then
@@ -28,7 +28,6 @@ _archs=(
alpha
arm
armeb
- cris
hexagon
hppa
i386
From e95cd8fbe5be939c112d6a4399b36ae80f2ddd80 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:12 -0500
Subject: [PATCH 2/3] qemu: update to 9.2.0.
---
srcpkgs/qemu-system-cris | 1 -
srcpkgs/qemu/patches/lfs64.patch | 211 -------------------------------
srcpkgs/qemu/template | 7 +-
3 files changed, 3 insertions(+), 216 deletions(-)
delete mode 120000 srcpkgs/qemu-system-cris
delete mode 100644 srcpkgs/qemu/patches/lfs64.patch
diff --git a/srcpkgs/qemu-system-cris b/srcpkgs/qemu-system-cris
deleted file mode 120000
index d3d421aa08c50d..00000000000000
--- a/srcpkgs/qemu-system-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu
\ No newline at end of file
diff --git a/srcpkgs/qemu/patches/lfs64.patch b/srcpkgs/qemu/patches/lfs64.patch
deleted file mode 100644
index d198ad2ba28eab..00000000000000
--- a/srcpkgs/qemu/patches/lfs64.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
-anf macros behave same as their 64 suffixed counterparts. This also
-helps in compiling with latest musl C library, where these macros and
-functions are no more available under _GNU_SOURCE feature macro
-
-source: https://git.alpinelinux.org/aports/plain/community/qemu/lfs64.patch
---
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index bbba2a6..38fa09a 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -6812,13 +6812,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- ret = cmd;
- break;
- case TARGET_F_GETLK:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- case TARGET_F_GETOWN:
- ret = F_GETOWN;
-@@ -6834,13 +6834,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- break;
- #if TARGET_ABI_BITS == 32
- case TARGET_F_GETLK64:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK64:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW64:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- #endif
- case TARGET_F_SETLEASE:
-@@ -6894,8 +6894,8 @@ static int target_to_host_fcntl_cmd(int cmd)
- * them to 5, 6 and 7 before making the syscall(). Since we make the
- * syscall directly, adjust to what is supported by the kernel.
- */
-- if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
-- ret -= F_GETLK64 - 5;
-+ if (ret >= F_GETLK && ret <= F_SETLKW) {
-+ ret -= F_GETLK - 5;
- }
- #endif
-
-@@ -6928,7 +6928,7 @@ static int host_to_target_flock(int type)
- return type;
- }
-
--static inline abi_long copy_from_user_flock(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock *target_fl;
-@@ -6953,7 +6953,7 @@ static inline abi_long copy_from_user_flock(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock *target_fl;
- short l_type;
-@@ -6972,8 +6972,8 @@ static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
- return 0;
- }
-
--typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
--typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
-+typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
-+typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
-
- #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
- struct target_oabi_flock64 {
-@@ -6984,7 +6984,7 @@ struct target_oabi_flock64 {
- abi_int l_pid;
- } QEMU_PACKED;
-
--static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_oabi_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_oabi_flock64 *target_fl;
-@@ -7009,7 +7009,7 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_oabi_flock64 *target_fl;
- short l_type;
-@@ -7029,7 +7029,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
- }
- #endif
-
--static inline abi_long copy_from_user_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock64 *target_fl;
-@@ -7054,7 +7054,7 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock64 *target_fl;
- short l_type;
-@@ -7075,7 +7075,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-
- static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
- {
-- struct flock64 fl64;
-+ struct flock fl64;
- #ifdef F_GETOWN_EX
- struct f_owner_ex fox;
- struct target_f_owner_ex *target_fox;
-@@ -7347,7 +7347,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -7361,7 +7361,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -8597,7 +8597,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8650,7 +8650,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -8684,7 +8684,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8726,7 +8726,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -11157,7 +11157,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, ret);
- return ret;
- case TARGET_NR_pwrite64:
-@@ -11174,7 +11174,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, 0);
- return ret;
- #endif
-@@ -12034,7 +12034,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- case TARGET_NR_fcntl64:
- {
- int cmd;
-- struct flock64 fl;
-+ struct flock fl;
- from_flock64_fn *copyfrom = copy_from_user_flock64;
- to_flock64_fn *copyto = copy_to_user_flock64;
-
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index f9ca19f821ac41..5592ecbb250835 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,7 +1,7 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user
pkgname=qemu
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -25,7 +25,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
ignore_elf_dirs="/usr/share/qemu"
build_options="gtk3 iscsi jack numa opengl pulseaudio sdl2 smartcard spice virgl"
@@ -51,7 +51,6 @@ _archs=(
alpha
arm
avr
- cris
hppa
i386
loongarch64
@@ -113,7 +112,7 @@ for _arch in "${_archs[@]}"; do
_extras="opensbi-riscv64-generic-fw_dynamic.bin"
;;
s390x)
- _extras="s390-ccw.img s390-netboot.img"
+ _extras="s390-ccw.img"
;;
sparc)
_extras="openbios-sparc32"
From 9e1d6ed41ae69269a32fe1fc3de2c873bfac031f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:17 -0500
Subject: [PATCH 3/3] removed-packages: update to 0.1.20241213.
---
srcpkgs/removed-packages/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1f5199d6f8bd07..aab3b0dddd75c4 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20241127
+version=0.1.20241213
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -89,9 +89,9 @@ replaces="
csync<=0.50.0_5
ctpp2-devel<=2.8.3_7
ctpp2<=2.8.3_7
- cura<=4.13.1
- cura-fdm-materials<=2019.08.21_1
cura-engine<=4.13.1_6
+ cura-fdm-materials<=2019.08.21_1
+ cura<=4.13.1
cycle<=0.3.2_2
deepin-calculator<=5.0.1_1
deepin-draw<=1.0.0_1
@@ -339,13 +339,13 @@ replaces="
ladish-devel<=1_11
ladish<=1_11
laditools<=1.1.0_3
- libArcus<=4.13.1_8
libArcus-devel<=4.13.1_8
libArcus-python3<=4.13.1_8
+ libArcus<=4.13.1_8
libCharon<=4.13.0_3
- libSavitar<=4.13.1_3
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
+ libSavitar<=4.13.1_3
libXevie<=1.0.3_8
libXfontcache<=1.0.5_2
libXxf86misc<=1.0.4_1
@@ -743,6 +743,8 @@ replaces="
python3-sqlalchemy-migrate<=0.12.0_6
python3-stormssh<=0.7.0_7
python3-txacme<=0.9.3_3
+ qemu-system-cris<=9.1.2_1
+ qemu-user-cris<=9.1.2_1
qimageblitz<=0.0.6_4
qqc2-desktop-style<=5.115.0_1
qt-designer-devel<=4.8.7_29
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] qemu: update to 9.2.0.
2024-12-13 18:57 [PR PATCH] qemu: update to 9.2.0 classabbyamp
@ 2024-12-15 18:35 ` classabbyamp
2024-12-15 18:35 ` [PR PATCH] [Closed]: " classabbyamp
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2024-12-15 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu
https://github.com/void-linux/void-packages/pull/53509
qemu: update to 9.2.0.
- **qemu-user: update to 9.2.0.**
- **qemu: update to 9.2.0.**
- **removed-packages: update to 0.1.20241213.**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **in progress**
A patch file from https://github.com/void-linux/void-packages/pull/53509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-53509.patch --]
[-- Type: text/x-diff, Size: 17022 bytes --]
From 220d3849f5a93e486af1e0d8fa67a6a7fa93d8de Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:08 -0500
Subject: [PATCH 1/5] qemu-user: update to 9.2.0.
---
srcpkgs/qemu-user-cris | 1 -
srcpkgs/qemu-user/template | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
delete mode 120000 srcpkgs/qemu-user-cris
diff --git a/srcpkgs/qemu-user-cris b/srcpkgs/qemu-user-cris
deleted file mode 120000
index 62973fbc0559e9..00000000000000
--- a/srcpkgs/qemu-user-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu-user
\ No newline at end of file
diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template
index eaa6beeb687081..b8222ea544180c 100644
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@@ -1,7 +1,7 @@
# Template file for 'qemu-user'
# This package should be updated together with qemu
pkgname=qemu-user
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -15,7 +15,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
subpackages="qemu-user-static"
if [ "$CROSS_BUILD" ]; then
@@ -28,7 +28,6 @@ _archs=(
alpha
arm
armeb
- cris
hexagon
hppa
i386
From 3dc93a847d436c988cb210cf9bae941ab5de30cd Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:12 -0500
Subject: [PATCH 2/5] qemu: update to 9.2.0.
---
srcpkgs/qemu-system-cris | 1 -
srcpkgs/qemu/patches/lfs64.patch | 211 -------------------------------
srcpkgs/qemu/template | 7 +-
3 files changed, 3 insertions(+), 216 deletions(-)
delete mode 120000 srcpkgs/qemu-system-cris
delete mode 100644 srcpkgs/qemu/patches/lfs64.patch
diff --git a/srcpkgs/qemu-system-cris b/srcpkgs/qemu-system-cris
deleted file mode 120000
index d3d421aa08c50d..00000000000000
--- a/srcpkgs/qemu-system-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu
\ No newline at end of file
diff --git a/srcpkgs/qemu/patches/lfs64.patch b/srcpkgs/qemu/patches/lfs64.patch
deleted file mode 100644
index d198ad2ba28eab..00000000000000
--- a/srcpkgs/qemu/patches/lfs64.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
-anf macros behave same as their 64 suffixed counterparts. This also
-helps in compiling with latest musl C library, where these macros and
-functions are no more available under _GNU_SOURCE feature macro
-
-source: https://git.alpinelinux.org/aports/plain/community/qemu/lfs64.patch
---
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index bbba2a6..38fa09a 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -6812,13 +6812,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- ret = cmd;
- break;
- case TARGET_F_GETLK:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- case TARGET_F_GETOWN:
- ret = F_GETOWN;
-@@ -6834,13 +6834,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- break;
- #if TARGET_ABI_BITS == 32
- case TARGET_F_GETLK64:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK64:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW64:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- #endif
- case TARGET_F_SETLEASE:
-@@ -6894,8 +6894,8 @@ static int target_to_host_fcntl_cmd(int cmd)
- * them to 5, 6 and 7 before making the syscall(). Since we make the
- * syscall directly, adjust to what is supported by the kernel.
- */
-- if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
-- ret -= F_GETLK64 - 5;
-+ if (ret >= F_GETLK && ret <= F_SETLKW) {
-+ ret -= F_GETLK - 5;
- }
- #endif
-
-@@ -6928,7 +6928,7 @@ static int host_to_target_flock(int type)
- return type;
- }
-
--static inline abi_long copy_from_user_flock(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock *target_fl;
-@@ -6953,7 +6953,7 @@ static inline abi_long copy_from_user_flock(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock *target_fl;
- short l_type;
-@@ -6972,8 +6972,8 @@ static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
- return 0;
- }
-
--typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
--typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
-+typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
-+typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
-
- #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
- struct target_oabi_flock64 {
-@@ -6984,7 +6984,7 @@ struct target_oabi_flock64 {
- abi_int l_pid;
- } QEMU_PACKED;
-
--static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_oabi_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_oabi_flock64 *target_fl;
-@@ -7009,7 +7009,7 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_oabi_flock64 *target_fl;
- short l_type;
-@@ -7029,7 +7029,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
- }
- #endif
-
--static inline abi_long copy_from_user_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock64 *target_fl;
-@@ -7054,7 +7054,7 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock64 *target_fl;
- short l_type;
-@@ -7075,7 +7075,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-
- static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
- {
-- struct flock64 fl64;
-+ struct flock fl64;
- #ifdef F_GETOWN_EX
- struct f_owner_ex fox;
- struct target_f_owner_ex *target_fox;
-@@ -7347,7 +7347,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -7361,7 +7361,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -8597,7 +8597,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8650,7 +8650,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -8684,7 +8684,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8726,7 +8726,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -11157,7 +11157,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, ret);
- return ret;
- case TARGET_NR_pwrite64:
-@@ -11174,7 +11174,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, 0);
- return ret;
- #endif
-@@ -12034,7 +12034,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- case TARGET_NR_fcntl64:
- {
- int cmd;
-- struct flock64 fl;
-+ struct flock fl;
- from_flock64_fn *copyfrom = copy_from_user_flock64;
- to_flock64_fn *copyto = copy_to_user_flock64;
-
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index f9ca19f821ac41..5592ecbb250835 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,7 +1,7 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user
pkgname=qemu
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -25,7 +25,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
ignore_elf_dirs="/usr/share/qemu"
build_options="gtk3 iscsi jack numa opengl pulseaudio sdl2 smartcard spice virgl"
@@ -51,7 +51,6 @@ _archs=(
alpha
arm
avr
- cris
hppa
i386
loongarch64
@@ -113,7 +112,7 @@ for _arch in "${_archs[@]}"; do
_extras="opensbi-riscv64-generic-fw_dynamic.bin"
;;
s390x)
- _extras="s390-ccw.img s390-netboot.img"
+ _extras="s390-ccw.img"
;;
sparc)
_extras="openbios-sparc32"
From 4bf775879eb105b11c3bb7c3e100d63695da72ef Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:17 -0500
Subject: [PATCH 3/5] removed-packages: update to 0.1.20241213.
---
srcpkgs/removed-packages/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fee5d69f35b672..d4d327f6b85196 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20241127
+version=0.1.20241213
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -89,9 +89,9 @@ replaces="
csync<=0.50.0_5
ctpp2-devel<=2.8.3_7
ctpp2<=2.8.3_7
- cura<=4.13.1
- cura-fdm-materials<=2019.08.21_1
cura-engine<=4.13.1_6
+ cura-fdm-materials<=2019.08.21_1
+ cura<=4.13.1
cycle<=0.3.2_2
deepin-calculator<=5.0.1_1
deepin-draw<=1.0.0_1
@@ -339,13 +339,13 @@ replaces="
ladish-devel<=1_11
ladish<=1_11
laditools<=1.1.0_3
- libArcus<=4.13.1_8
libArcus-devel<=4.13.1_8
libArcus-python3<=4.13.1_8
+ libArcus<=4.13.1_8
libCharon<=4.13.0_3
- libSavitar<=4.13.1_3
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
+ libSavitar<=4.13.1_3
libXevie<=1.0.3_8
libXfontcache<=1.0.5_2
libXxf86misc<=1.0.4_1
@@ -752,6 +752,8 @@ replaces="
python3-tables<=3.7.0_4
python3-txacme<=0.9.3_3
python3-typed-ast<=1.5.4_3
+ qemu-system-cris<=9.1.2_1
+ qemu-user-cris<=9.1.2_1
qimageblitz<=0.0.6_4
qqc2-desktop-style<=5.115.0_1
qt-designer-devel<=4.8.7_29
From 64790e51d3a7b037dce7fd4a21396eb361fd4b9f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 15 Dec 2024 13:34:43 -0500
Subject: [PATCH 4/5] fixup! qemu-user: update to 9.2.0.
---
srcpkgs/qemu-user/template | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template
index b8222ea544180c..63eabb622ee0a1 100644
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@@ -8,7 +8,7 @@ configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--enable-linux-user --disable-system --static
-Dkvm=disabled -Dpng=disabled -Dvirtfs=disabled -Dfdt=disabled -Dseccomp=disabled
-Dtools=disabled"
-hostmakedepends="meson flex glib-devel pkg-config perl"
+hostmakedepends="meson flex glib-devel pkg-config perl python3-pycotap"
makedepends="dtc-devel glib-devel pixman-devel libuuid-devel"
short_desc="QEMU user-mode emulators"
maintainer="classabbyamp <void@placeviolette.net>"
@@ -72,6 +72,8 @@ done
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_user_tmpl() {
_arch="$1"
_binfmt="$2"
@@ -83,6 +85,11 @@ _user_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# provided by qemu
rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec ${DESTDIR}/usr/include
From b933d5f7ec7d63a908fa0f22ad55525758519d21 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 15 Dec 2024 13:34:50 -0500
Subject: [PATCH 5/5] fixup! qemu: update to 9.2.0.
---
srcpkgs/qemu/template | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index 5592ecbb250835..c14825ff550285 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -10,7 +10,8 @@ configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
-Dtpm=enabled -Dusb_redir=enabled -Dvhost_net=enabled -Dvirtfs=enabled -Dpng=enabled
-Daudio_drv_list=alsa,sdl,jack,pa -Dopengl=enabled -Dpa=enabled -Dsdl=enabled
-Dsmartcard=enabled -Dspice=enabled -Dvirglrenderer=enabled -Dgtk=enabled"
-hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme"
+hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme
+ python3-pycotap"
makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
libsasl-devel ncurses-devel libseccomp-devel nss-devel
@@ -19,7 +20,7 @@ makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-de
libxkbcommon-devel libzstd-devel SDL2-devel SDL2_image-devel gtk+3-devel
vte3-devel spice-devel pcsclite-devel virglrenderer-devel libepoxy-devel
libdrm-devel MesaLib-devel libiscsi-devel libcacard-devel libnuma-devel
- jack-devel pulseaudio-devel"
+ jack-devel pulseaudio-devel libcbor-devel"
short_desc="Open source processor emulator"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
@@ -135,6 +136,8 @@ subpackages+=" qemu-common"
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_sys_tmpl() {
_arch="$1"
_depends="$2"
@@ -151,6 +154,11 @@ _sys_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# qemu-bridge-helper must be setuid for non privileged users.
chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: qemu: update to 9.2.0.
2024-12-13 18:57 [PR PATCH] qemu: update to 9.2.0 classabbyamp
2024-12-15 18:35 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-12-15 18:35 ` classabbyamp
2024-12-19 5:28 ` [PR PATCH] [Updated] " classabbyamp
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2024-12-15 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
There's a closed pull request on the void-packages repository
qemu: update to 9.2.0.
https://github.com/void-linux/void-packages/pull/53509
Description:
- **qemu-user: update to 9.2.0.**
- **qemu: update to 9.2.0.**
- **removed-packages: update to 0.1.20241213.**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **in progress**
**requires meson 1.5.0 https://github.com/void-linux/void-packages/pull/53322**
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] qemu: update to 9.2.0.
2024-12-13 18:57 [PR PATCH] qemu: update to 9.2.0 classabbyamp
2024-12-15 18:35 ` [PR PATCH] [Updated] " classabbyamp
2024-12-15 18:35 ` [PR PATCH] [Closed]: " classabbyamp
@ 2024-12-19 5:28 ` classabbyamp
2024-12-23 0:53 ` classabbyamp
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2024-12-19 5:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu
https://github.com/void-linux/void-packages/pull/53509
qemu: update to 9.2.0.
- **qemu-user: update to 9.2.0.**
- **qemu: update to 9.2.0.**
- **removed-packages: update to 0.1.20241213.**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **in progress**
**requires meson 1.5.0 https://github.com/void-linux/void-packages/pull/53322**
A patch file from https://github.com/void-linux/void-packages/pull/53509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-53509.patch --]
[-- Type: text/x-diff, Size: 15827 bytes --]
From aaa3221c0fc892f768016c2ca052ba1d8e5ab4ce Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:08 -0500
Subject: [PATCH 1/3] qemu-user: update to 9.2.0.
---
srcpkgs/qemu-user-cris | 1 -
srcpkgs/qemu-user/template | 14 ++++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
delete mode 120000 srcpkgs/qemu-user-cris
diff --git a/srcpkgs/qemu-user-cris b/srcpkgs/qemu-user-cris
deleted file mode 120000
index 62973fbc0559e9..00000000000000
--- a/srcpkgs/qemu-user-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu-user
\ No newline at end of file
diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template
index eaa6beeb687081..63eabb622ee0a1 100644
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@@ -1,21 +1,21 @@
# Template file for 'qemu-user'
# This package should be updated together with qemu
pkgname=qemu-user
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--enable-linux-user --disable-system --static
-Dkvm=disabled -Dpng=disabled -Dvirtfs=disabled -Dfdt=disabled -Dseccomp=disabled
-Dtools=disabled"
-hostmakedepends="meson flex glib-devel pkg-config perl"
+hostmakedepends="meson flex glib-devel pkg-config perl python3-pycotap"
makedepends="dtc-devel glib-devel pixman-devel libuuid-devel"
short_desc="QEMU user-mode emulators"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
subpackages="qemu-user-static"
if [ "$CROSS_BUILD" ]; then
@@ -28,7 +28,6 @@ _archs=(
alpha
arm
armeb
- cris
hexagon
hppa
i386
@@ -73,6 +72,8 @@ done
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_user_tmpl() {
_arch="$1"
_binfmt="$2"
@@ -84,6 +85,11 @@ _user_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# provided by qemu
rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec ${DESTDIR}/usr/include
From 88e99564ee07b2a3464176fb29e77dcd33478540 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:12 -0500
Subject: [PATCH 2/3] qemu: update to 9.2.0.
---
srcpkgs/qemu-system-cris | 1 -
srcpkgs/qemu/patches/lfs64.patch | 211 -------------------------------
srcpkgs/qemu/template | 19 ++-
3 files changed, 13 insertions(+), 218 deletions(-)
delete mode 120000 srcpkgs/qemu-system-cris
delete mode 100644 srcpkgs/qemu/patches/lfs64.patch
diff --git a/srcpkgs/qemu-system-cris b/srcpkgs/qemu-system-cris
deleted file mode 120000
index d3d421aa08c50d..00000000000000
--- a/srcpkgs/qemu-system-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu
\ No newline at end of file
diff --git a/srcpkgs/qemu/patches/lfs64.patch b/srcpkgs/qemu/patches/lfs64.patch
deleted file mode 100644
index d198ad2ba28eab..00000000000000
--- a/srcpkgs/qemu/patches/lfs64.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
-anf macros behave same as their 64 suffixed counterparts. This also
-helps in compiling with latest musl C library, where these macros and
-functions are no more available under _GNU_SOURCE feature macro
-
-source: https://git.alpinelinux.org/aports/plain/community/qemu/lfs64.patch
---
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index bbba2a6..38fa09a 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -6812,13 +6812,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- ret = cmd;
- break;
- case TARGET_F_GETLK:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- case TARGET_F_GETOWN:
- ret = F_GETOWN;
-@@ -6834,13 +6834,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- break;
- #if TARGET_ABI_BITS == 32
- case TARGET_F_GETLK64:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK64:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW64:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- #endif
- case TARGET_F_SETLEASE:
-@@ -6894,8 +6894,8 @@ static int target_to_host_fcntl_cmd(int cmd)
- * them to 5, 6 and 7 before making the syscall(). Since we make the
- * syscall directly, adjust to what is supported by the kernel.
- */
-- if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
-- ret -= F_GETLK64 - 5;
-+ if (ret >= F_GETLK && ret <= F_SETLKW) {
-+ ret -= F_GETLK - 5;
- }
- #endif
-
-@@ -6928,7 +6928,7 @@ static int host_to_target_flock(int type)
- return type;
- }
-
--static inline abi_long copy_from_user_flock(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock *target_fl;
-@@ -6953,7 +6953,7 @@ static inline abi_long copy_from_user_flock(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock *target_fl;
- short l_type;
-@@ -6972,8 +6972,8 @@ static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
- return 0;
- }
-
--typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
--typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
-+typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
-+typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
-
- #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
- struct target_oabi_flock64 {
-@@ -6984,7 +6984,7 @@ struct target_oabi_flock64 {
- abi_int l_pid;
- } QEMU_PACKED;
-
--static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_oabi_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_oabi_flock64 *target_fl;
-@@ -7009,7 +7009,7 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_oabi_flock64 *target_fl;
- short l_type;
-@@ -7029,7 +7029,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
- }
- #endif
-
--static inline abi_long copy_from_user_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock64 *target_fl;
-@@ -7054,7 +7054,7 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock64 *target_fl;
- short l_type;
-@@ -7075,7 +7075,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-
- static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
- {
-- struct flock64 fl64;
-+ struct flock fl64;
- #ifdef F_GETOWN_EX
- struct f_owner_ex fox;
- struct target_f_owner_ex *target_fox;
-@@ -7347,7 +7347,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -7361,7 +7361,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -8597,7 +8597,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8650,7 +8650,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -8684,7 +8684,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8726,7 +8726,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -11157,7 +11157,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, ret);
- return ret;
- case TARGET_NR_pwrite64:
-@@ -11174,7 +11174,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, 0);
- return ret;
- #endif
-@@ -12034,7 +12034,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- case TARGET_NR_fcntl64:
- {
- int cmd;
-- struct flock64 fl;
-+ struct flock fl;
- from_flock64_fn *copyfrom = copy_from_user_flock64;
- to_flock64_fn *copyto = copy_to_user_flock64;
-
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index f9ca19f821ac41..c14825ff550285 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,7 +1,7 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user
pkgname=qemu
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -10,7 +10,8 @@ configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
-Dtpm=enabled -Dusb_redir=enabled -Dvhost_net=enabled -Dvirtfs=enabled -Dpng=enabled
-Daudio_drv_list=alsa,sdl,jack,pa -Dopengl=enabled -Dpa=enabled -Dsdl=enabled
-Dsmartcard=enabled -Dspice=enabled -Dvirglrenderer=enabled -Dgtk=enabled"
-hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme"
+hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme
+ python3-pycotap"
makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
libsasl-devel ncurses-devel libseccomp-devel nss-devel
@@ -19,13 +20,13 @@ makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-de
libxkbcommon-devel libzstd-devel SDL2-devel SDL2_image-devel gtk+3-devel
vte3-devel spice-devel pcsclite-devel virglrenderer-devel libepoxy-devel
libdrm-devel MesaLib-devel libiscsi-devel libcacard-devel libnuma-devel
- jack-devel pulseaudio-devel"
+ jack-devel pulseaudio-devel libcbor-devel"
short_desc="Open source processor emulator"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
ignore_elf_dirs="/usr/share/qemu"
build_options="gtk3 iscsi jack numa opengl pulseaudio sdl2 smartcard spice virgl"
@@ -51,7 +52,6 @@ _archs=(
alpha
arm
avr
- cris
hppa
i386
loongarch64
@@ -113,7 +113,7 @@ for _arch in "${_archs[@]}"; do
_extras="opensbi-riscv64-generic-fw_dynamic.bin"
;;
s390x)
- _extras="s390-ccw.img s390-netboot.img"
+ _extras="s390-ccw.img"
;;
sparc)
_extras="openbios-sparc32"
@@ -136,6 +136,8 @@ subpackages+=" qemu-common"
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_sys_tmpl() {
_arch="$1"
_depends="$2"
@@ -152,6 +154,11 @@ _sys_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# qemu-bridge-helper must be setuid for non privileged users.
chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
From 3b2444e5d99956b6eb362d371b597b9282a4f874 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:17 -0500
Subject: [PATCH 3/3] removed-packages: update to 0.1.20241213.
---
srcpkgs/removed-packages/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fee5d69f35b672..d4d327f6b85196 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20241127
+version=0.1.20241213
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -89,9 +89,9 @@ replaces="
csync<=0.50.0_5
ctpp2-devel<=2.8.3_7
ctpp2<=2.8.3_7
- cura<=4.13.1
- cura-fdm-materials<=2019.08.21_1
cura-engine<=4.13.1_6
+ cura-fdm-materials<=2019.08.21_1
+ cura<=4.13.1
cycle<=0.3.2_2
deepin-calculator<=5.0.1_1
deepin-draw<=1.0.0_1
@@ -339,13 +339,13 @@ replaces="
ladish-devel<=1_11
ladish<=1_11
laditools<=1.1.0_3
- libArcus<=4.13.1_8
libArcus-devel<=4.13.1_8
libArcus-python3<=4.13.1_8
+ libArcus<=4.13.1_8
libCharon<=4.13.0_3
- libSavitar<=4.13.1_3
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
+ libSavitar<=4.13.1_3
libXevie<=1.0.3_8
libXfontcache<=1.0.5_2
libXxf86misc<=1.0.4_1
@@ -752,6 +752,8 @@ replaces="
python3-tables<=3.7.0_4
python3-txacme<=0.9.3_3
python3-typed-ast<=1.5.4_3
+ qemu-system-cris<=9.1.2_1
+ qemu-user-cris<=9.1.2_1
qimageblitz<=0.0.6_4
qqc2-desktop-style<=5.115.0_1
qt-designer-devel<=4.8.7_29
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] qemu: update to 9.2.0.
2024-12-13 18:57 [PR PATCH] qemu: update to 9.2.0 classabbyamp
` (2 preceding siblings ...)
2024-12-19 5:28 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-12-23 0:53 ` classabbyamp
2024-12-23 4:23 ` classabbyamp
2024-12-23 17:55 ` [PR PATCH] [Merged]: " classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2024-12-23 0:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu
https://github.com/void-linux/void-packages/pull/53509
qemu: update to 9.2.0.
- **qemu-user: update to 9.2.0.**
- **qemu: update to 9.2.0.**
- **removed-packages: update to 0.1.20241213.**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **in progress**
**requires meson 1.5.0 https://github.com/void-linux/void-packages/pull/53322**
A patch file from https://github.com/void-linux/void-packages/pull/53509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-53509.patch --]
[-- Type: text/x-diff, Size: 17045 bytes --]
From cf018da1da1aaf7d7b3aa2c32ed6d54d2e478bcd Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 2 Dec 2024 22:59:31 -0600
Subject: [PATCH 1/4] meson: update to 1.6.1.
---
srcpkgs/meson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 32dc1b30feb221..b9f6e37a9704eb 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=1.4.0
-revision=3
+version=1.6.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
+checksum=1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From e5871653c81bdd7d5ed4196d408654b242bbc87e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:08 -0500
Subject: [PATCH 2/4] qemu-user: update to 9.2.0.
---
srcpkgs/qemu-user-cris | 1 -
srcpkgs/qemu-user/template | 14 ++++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
delete mode 120000 srcpkgs/qemu-user-cris
diff --git a/srcpkgs/qemu-user-cris b/srcpkgs/qemu-user-cris
deleted file mode 120000
index 62973fbc0559e9..00000000000000
--- a/srcpkgs/qemu-user-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu-user
\ No newline at end of file
diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template
index eaa6beeb687081..63eabb622ee0a1 100644
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@@ -1,21 +1,21 @@
# Template file for 'qemu-user'
# This package should be updated together with qemu
pkgname=qemu-user
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--enable-linux-user --disable-system --static
-Dkvm=disabled -Dpng=disabled -Dvirtfs=disabled -Dfdt=disabled -Dseccomp=disabled
-Dtools=disabled"
-hostmakedepends="meson flex glib-devel pkg-config perl"
+hostmakedepends="meson flex glib-devel pkg-config perl python3-pycotap"
makedepends="dtc-devel glib-devel pixman-devel libuuid-devel"
short_desc="QEMU user-mode emulators"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
subpackages="qemu-user-static"
if [ "$CROSS_BUILD" ]; then
@@ -28,7 +28,6 @@ _archs=(
alpha
arm
armeb
- cris
hexagon
hppa
i386
@@ -73,6 +72,8 @@ done
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_user_tmpl() {
_arch="$1"
_binfmt="$2"
@@ -84,6 +85,11 @@ _user_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# provided by qemu
rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec ${DESTDIR}/usr/include
From b04a83fa66e886fa74403d04fc0107083fda3938 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:12 -0500
Subject: [PATCH 3/4] qemu: update to 9.2.0.
---
srcpkgs/qemu-system-cris | 1 -
srcpkgs/qemu/patches/lfs64.patch | 211 -------------------------------
srcpkgs/qemu/template | 19 ++-
3 files changed, 13 insertions(+), 218 deletions(-)
delete mode 120000 srcpkgs/qemu-system-cris
delete mode 100644 srcpkgs/qemu/patches/lfs64.patch
diff --git a/srcpkgs/qemu-system-cris b/srcpkgs/qemu-system-cris
deleted file mode 120000
index d3d421aa08c50d..00000000000000
--- a/srcpkgs/qemu-system-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu
\ No newline at end of file
diff --git a/srcpkgs/qemu/patches/lfs64.patch b/srcpkgs/qemu/patches/lfs64.patch
deleted file mode 100644
index d198ad2ba28eab..00000000000000
--- a/srcpkgs/qemu/patches/lfs64.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
-anf macros behave same as their 64 suffixed counterparts. This also
-helps in compiling with latest musl C library, where these macros and
-functions are no more available under _GNU_SOURCE feature macro
-
-source: https://git.alpinelinux.org/aports/plain/community/qemu/lfs64.patch
---
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index bbba2a6..38fa09a 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -6812,13 +6812,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- ret = cmd;
- break;
- case TARGET_F_GETLK:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- case TARGET_F_GETOWN:
- ret = F_GETOWN;
-@@ -6834,13 +6834,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- break;
- #if TARGET_ABI_BITS == 32
- case TARGET_F_GETLK64:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK64:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW64:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- #endif
- case TARGET_F_SETLEASE:
-@@ -6894,8 +6894,8 @@ static int target_to_host_fcntl_cmd(int cmd)
- * them to 5, 6 and 7 before making the syscall(). Since we make the
- * syscall directly, adjust to what is supported by the kernel.
- */
-- if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
-- ret -= F_GETLK64 - 5;
-+ if (ret >= F_GETLK && ret <= F_SETLKW) {
-+ ret -= F_GETLK - 5;
- }
- #endif
-
-@@ -6928,7 +6928,7 @@ static int host_to_target_flock(int type)
- return type;
- }
-
--static inline abi_long copy_from_user_flock(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock *target_fl;
-@@ -6953,7 +6953,7 @@ static inline abi_long copy_from_user_flock(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock *target_fl;
- short l_type;
-@@ -6972,8 +6972,8 @@ static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
- return 0;
- }
-
--typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
--typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
-+typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
-+typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
-
- #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
- struct target_oabi_flock64 {
-@@ -6984,7 +6984,7 @@ struct target_oabi_flock64 {
- abi_int l_pid;
- } QEMU_PACKED;
-
--static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_oabi_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_oabi_flock64 *target_fl;
-@@ -7009,7 +7009,7 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_oabi_flock64 *target_fl;
- short l_type;
-@@ -7029,7 +7029,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
- }
- #endif
-
--static inline abi_long copy_from_user_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock64 *target_fl;
-@@ -7054,7 +7054,7 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock64 *target_fl;
- short l_type;
-@@ -7075,7 +7075,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-
- static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
- {
-- struct flock64 fl64;
-+ struct flock fl64;
- #ifdef F_GETOWN_EX
- struct f_owner_ex fox;
- struct target_f_owner_ex *target_fox;
-@@ -7347,7 +7347,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -7361,7 +7361,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -8597,7 +8597,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8650,7 +8650,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -8684,7 +8684,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8726,7 +8726,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -11157,7 +11157,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, ret);
- return ret;
- case TARGET_NR_pwrite64:
-@@ -11174,7 +11174,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, 0);
- return ret;
- #endif
-@@ -12034,7 +12034,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- case TARGET_NR_fcntl64:
- {
- int cmd;
-- struct flock64 fl;
-+ struct flock fl;
- from_flock64_fn *copyfrom = copy_from_user_flock64;
- to_flock64_fn *copyto = copy_to_user_flock64;
-
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index f9ca19f821ac41..c14825ff550285 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,7 +1,7 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user
pkgname=qemu
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -10,7 +10,8 @@ configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
-Dtpm=enabled -Dusb_redir=enabled -Dvhost_net=enabled -Dvirtfs=enabled -Dpng=enabled
-Daudio_drv_list=alsa,sdl,jack,pa -Dopengl=enabled -Dpa=enabled -Dsdl=enabled
-Dsmartcard=enabled -Dspice=enabled -Dvirglrenderer=enabled -Dgtk=enabled"
-hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme"
+hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme
+ python3-pycotap"
makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
libsasl-devel ncurses-devel libseccomp-devel nss-devel
@@ -19,13 +20,13 @@ makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-de
libxkbcommon-devel libzstd-devel SDL2-devel SDL2_image-devel gtk+3-devel
vte3-devel spice-devel pcsclite-devel virglrenderer-devel libepoxy-devel
libdrm-devel MesaLib-devel libiscsi-devel libcacard-devel libnuma-devel
- jack-devel pulseaudio-devel"
+ jack-devel pulseaudio-devel libcbor-devel"
short_desc="Open source processor emulator"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
ignore_elf_dirs="/usr/share/qemu"
build_options="gtk3 iscsi jack numa opengl pulseaudio sdl2 smartcard spice virgl"
@@ -51,7 +52,6 @@ _archs=(
alpha
arm
avr
- cris
hppa
i386
loongarch64
@@ -113,7 +113,7 @@ for _arch in "${_archs[@]}"; do
_extras="opensbi-riscv64-generic-fw_dynamic.bin"
;;
s390x)
- _extras="s390-ccw.img s390-netboot.img"
+ _extras="s390-ccw.img"
;;
sparc)
_extras="openbios-sparc32"
@@ -136,6 +136,8 @@ subpackages+=" qemu-common"
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_sys_tmpl() {
_arch="$1"
_depends="$2"
@@ -152,6 +154,11 @@ _sys_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# qemu-bridge-helper must be setuid for non privileged users.
chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
From aa066fd49d51eb3774f71eaa4ea96d04358aa270 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:17 -0500
Subject: [PATCH 4/4] removed-packages: update to 0.1.20241213.
---
srcpkgs/removed-packages/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index fee5d69f35b672..d4d327f6b85196 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20241127
+version=0.1.20241213
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -89,9 +89,9 @@ replaces="
csync<=0.50.0_5
ctpp2-devel<=2.8.3_7
ctpp2<=2.8.3_7
- cura<=4.13.1
- cura-fdm-materials<=2019.08.21_1
cura-engine<=4.13.1_6
+ cura-fdm-materials<=2019.08.21_1
+ cura<=4.13.1
cycle<=0.3.2_2
deepin-calculator<=5.0.1_1
deepin-draw<=1.0.0_1
@@ -339,13 +339,13 @@ replaces="
ladish-devel<=1_11
ladish<=1_11
laditools<=1.1.0_3
- libArcus<=4.13.1_8
libArcus-devel<=4.13.1_8
libArcus-python3<=4.13.1_8
+ libArcus<=4.13.1_8
libCharon<=4.13.0_3
- libSavitar<=4.13.1_3
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
+ libSavitar<=4.13.1_3
libXevie<=1.0.3_8
libXfontcache<=1.0.5_2
libXxf86misc<=1.0.4_1
@@ -752,6 +752,8 @@ replaces="
python3-tables<=3.7.0_4
python3-txacme<=0.9.3_3
python3-typed-ast<=1.5.4_3
+ qemu-system-cris<=9.1.2_1
+ qemu-user-cris<=9.1.2_1
qimageblitz<=0.0.6_4
qqc2-desktop-style<=5.115.0_1
qt-designer-devel<=4.8.7_29
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] qemu: update to 9.2.0.
2024-12-13 18:57 [PR PATCH] qemu: update to 9.2.0 classabbyamp
` (3 preceding siblings ...)
2024-12-23 0:53 ` classabbyamp
@ 2024-12-23 4:23 ` classabbyamp
2024-12-23 17:55 ` [PR PATCH] [Merged]: " classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2024-12-23 4:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages qemu
https://github.com/void-linux/void-packages/pull/53509
qemu: update to 9.2.0.
- **qemu-user: update to 9.2.0.**
- **qemu: update to 9.2.0.**
- **removed-packages: update to 0.1.20241213.**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **in progress**
**requires meson 1.5.0 https://github.com/void-linux/void-packages/pull/53322**
A patch file from https://github.com/void-linux/void-packages/pull/53509.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qemu-53509.patch --]
[-- Type: text/x-diff, Size: 17358 bytes --]
From 8f880c2b0286cde4c0272a11008847e8030b904b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 2 Dec 2024 22:59:31 -0600
Subject: [PATCH 1/4] meson: update to 1.6.1.
---
srcpkgs/meson/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 32dc1b30feb221..b9f6e37a9704eb 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
# Template file for 'meson'
pkgname=meson
-version=1.4.0
-revision=3
+version=1.6.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://raw.githubusercontent.com/mesonbuild/meson/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz"
-checksum=8fd6630c25c27f1489a8a0392b311a60481a3c161aa699b330e25935b750138d
+checksum=1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From ff445de8c6ee0259857de51649769db2e45e41b5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:08 -0500
Subject: [PATCH 2/4] qemu-user: update to 9.2.0.
---
srcpkgs/qemu-user-cris | 1 -
srcpkgs/qemu-user/template | 14 ++++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
delete mode 120000 srcpkgs/qemu-user-cris
diff --git a/srcpkgs/qemu-user-cris b/srcpkgs/qemu-user-cris
deleted file mode 120000
index 62973fbc0559e9..00000000000000
--- a/srcpkgs/qemu-user-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu-user
\ No newline at end of file
diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template
index eaa6beeb687081..63eabb622ee0a1 100644
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@@ -1,21 +1,21 @@
# Template file for 'qemu-user'
# This package should be updated together with qemu
pkgname=qemu-user
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
--enable-linux-user --disable-system --static
-Dkvm=disabled -Dpng=disabled -Dvirtfs=disabled -Dfdt=disabled -Dseccomp=disabled
-Dtools=disabled"
-hostmakedepends="meson flex glib-devel pkg-config perl"
+hostmakedepends="meson flex glib-devel pkg-config perl python3-pycotap"
makedepends="dtc-devel glib-devel pixman-devel libuuid-devel"
short_desc="QEMU user-mode emulators"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
subpackages="qemu-user-static"
if [ "$CROSS_BUILD" ]; then
@@ -28,7 +28,6 @@ _archs=(
alpha
arm
armeb
- cris
hexagon
hppa
i386
@@ -73,6 +72,8 @@ done
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_user_tmpl() {
_arch="$1"
_binfmt="$2"
@@ -84,6 +85,11 @@ _user_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# provided by qemu
rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec ${DESTDIR}/usr/include
From 14fdfde0283a1e2dacb5ef194cb1e6420447c2df Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:12 -0500
Subject: [PATCH 3/4] qemu: update to 9.2.0.
---
srcpkgs/qemu-system-cris | 1 -
srcpkgs/qemu/patches/lfs64.patch | 211 -------------------------------
srcpkgs/qemu/template | 24 +++-
3 files changed, 17 insertions(+), 219 deletions(-)
delete mode 120000 srcpkgs/qemu-system-cris
delete mode 100644 srcpkgs/qemu/patches/lfs64.patch
diff --git a/srcpkgs/qemu-system-cris b/srcpkgs/qemu-system-cris
deleted file mode 120000
index d3d421aa08c50d..00000000000000
--- a/srcpkgs/qemu-system-cris
+++ /dev/null
@@ -1 +0,0 @@
-qemu
\ No newline at end of file
diff --git a/srcpkgs/qemu/patches/lfs64.patch b/srcpkgs/qemu/patches/lfs64.patch
deleted file mode 100644
index d198ad2ba28eab..00000000000000
--- a/srcpkgs/qemu/patches/lfs64.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
-anf macros behave same as their 64 suffixed counterparts. This also
-helps in compiling with latest musl C library, where these macros and
-functions are no more available under _GNU_SOURCE feature macro
-
-source: https://git.alpinelinux.org/aports/plain/community/qemu/lfs64.patch
---
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index bbba2a6..38fa09a 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -6812,13 +6812,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- ret = cmd;
- break;
- case TARGET_F_GETLK:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- case TARGET_F_GETOWN:
- ret = F_GETOWN;
-@@ -6834,13 +6834,13 @@ static int target_to_host_fcntl_cmd(int cmd)
- break;
- #if TARGET_ABI_BITS == 32
- case TARGET_F_GETLK64:
-- ret = F_GETLK64;
-+ ret = F_GETLK;
- break;
- case TARGET_F_SETLK64:
-- ret = F_SETLK64;
-+ ret = F_SETLK;
- break;
- case TARGET_F_SETLKW64:
-- ret = F_SETLKW64;
-+ ret = F_SETLKW;
- break;
- #endif
- case TARGET_F_SETLEASE:
-@@ -6894,8 +6894,8 @@ static int target_to_host_fcntl_cmd(int cmd)
- * them to 5, 6 and 7 before making the syscall(). Since we make the
- * syscall directly, adjust to what is supported by the kernel.
- */
-- if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
-- ret -= F_GETLK64 - 5;
-+ if (ret >= F_GETLK && ret <= F_SETLKW) {
-+ ret -= F_GETLK - 5;
- }
- #endif
-
-@@ -6928,7 +6928,7 @@ static int host_to_target_flock(int type)
- return type;
- }
-
--static inline abi_long copy_from_user_flock(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock *target_fl;
-@@ -6953,7 +6953,7 @@ static inline abi_long copy_from_user_flock(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock *target_fl;
- short l_type;
-@@ -6972,8 +6972,8 @@ static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
- return 0;
- }
-
--typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
--typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
-+typedef abi_long from_flock64_fn(struct flock *fl, abi_ulong target_addr);
-+typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock *fl);
-
- #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
- struct target_oabi_flock64 {
-@@ -6984,7 +6984,7 @@ struct target_oabi_flock64 {
- abi_int l_pid;
- } QEMU_PACKED;
-
--static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_oabi_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_oabi_flock64 *target_fl;
-@@ -7009,7 +7009,7 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_oabi_flock64 *target_fl;
- short l_type;
-@@ -7029,7 +7029,7 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
- }
- #endif
-
--static inline abi_long copy_from_user_flock64(struct flock64 *fl,
-+static inline abi_long copy_from_user_flock64(struct flock *fl,
- abi_ulong target_flock_addr)
- {
- struct target_flock64 *target_fl;
-@@ -7054,7 +7054,7 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
- }
-
- static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-- const struct flock64 *fl)
-+ const struct flock *fl)
- {
- struct target_flock64 *target_fl;
- short l_type;
-@@ -7075,7 +7075,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
-
- static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
- {
-- struct flock64 fl64;
-+ struct flock fl64;
- #ifdef F_GETOWN_EX
- struct f_owner_ex fox;
- struct target_f_owner_ex *target_fox;
-@@ -7347,7 +7347,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(truncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(truncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -7361,7 +7361,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
- arg2 = arg3;
- arg3 = arg4;
- }
-- return get_errno(ftruncate64(arg1, target_offset64(arg2, arg3)));
-+ return get_errno(ftruncate(arg1, target_offset64(arg2, arg3)));
- }
- #endif
-
-@@ -8597,7 +8597,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8650,7 +8650,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -8684,7 +8684,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- void *tdirp;
- int hlen, hoff, toff;
- int hreclen, treclen;
-- off64_t prev_diroff = 0;
-+ off_t prev_diroff = 0;
-
- hdirp = g_try_malloc(count);
- if (!hdirp) {
-@@ -8726,7 +8726,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
- * Return what we have, resetting the file pointer to the
- * location of the first record not returned.
- */
-- lseek64(dirfd, prev_diroff, SEEK_SET);
-+ lseek(dirfd, prev_diroff, SEEK_SET);
- break;
- }
-
-@@ -11157,7 +11157,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pread(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, ret);
- return ret;
- case TARGET_NR_pwrite64:
-@@ -11174,7 +11174,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- return -TARGET_EFAULT;
- }
- }
-- ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
-+ ret = get_errno(pwrite(arg1, p, arg3, target_offset64(arg4, arg5)));
- unlock_user(p, arg2, 0);
- return ret;
- #endif
-@@ -12034,7 +12034,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
- case TARGET_NR_fcntl64:
- {
- int cmd;
-- struct flock64 fl;
-+ struct flock fl;
- from_flock64_fn *copyfrom = copy_from_user_flock64;
- to_flock64_fn *copyto = copy_to_user_flock64;
-
diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template
index f9ca19f821ac41..2d9475301db4db 100644
--- a/srcpkgs/qemu/template
+++ b/srcpkgs/qemu/template
@@ -1,7 +1,7 @@
# Template file for 'qemu'
# This package should be updated together with qemu-user
pkgname=qemu
-version=9.1.2
+version=9.2.0
revision=1
build_style=meta
configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
@@ -10,7 +10,8 @@ configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
-Dtpm=enabled -Dusb_redir=enabled -Dvhost_net=enabled -Dvirtfs=enabled -Dpng=enabled
-Daudio_drv_list=alsa,sdl,jack,pa -Dopengl=enabled -Dpa=enabled -Dsdl=enabled
-Dsmartcard=enabled -Dspice=enabled -Dvirglrenderer=enabled -Dgtk=enabled"
-hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme"
+hostmakedepends="meson flex glib-devel gettext pkg-config perl python3-sphinx_rtd_theme
+ python3-pycotap"
makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel
snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel
libsasl-devel ncurses-devel libseccomp-devel nss-devel
@@ -19,13 +20,13 @@ makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-de
libxkbcommon-devel libzstd-devel SDL2-devel SDL2_image-devel gtk+3-devel
vte3-devel spice-devel pcsclite-devel virglrenderer-devel libepoxy-devel
libdrm-devel MesaLib-devel libiscsi-devel libcacard-devel libnuma-devel
- jack-devel pulseaudio-devel"
+ jack-devel pulseaudio-devel libcbor-devel"
short_desc="Open source processor emulator"
maintainer="classabbyamp <void@placeviolette.net>"
license="GPL-2.0-only, LGPL-2.1-only"
homepage="https://www.qemu.org"
distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2"
-checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea
+checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5
ignore_elf_dirs="/usr/share/qemu"
build_options="gtk3 iscsi jack numa opengl pulseaudio sdl2 smartcard spice virgl"
@@ -51,7 +52,6 @@ _archs=(
alpha
arm
avr
- cris
hppa
i386
loongarch64
@@ -113,7 +113,7 @@ for _arch in "${_archs[@]}"; do
_extras="opensbi-riscv64-generic-fw_dynamic.bin"
;;
s390x)
- _extras="s390-ccw.img s390-netboot.img"
+ _extras="s390-ccw.img"
;;
sparc)
_extras="openbios-sparc32"
@@ -136,6 +136,8 @@ subpackages+=" qemu-common"
. /void-packages/common/build-style/configure.sh 2>/dev/null
+export PYTHONUNBUFFERED=1
+
_sys_tmpl() {
_arch="$1"
_depends="$2"
@@ -152,6 +154,11 @@ _sys_tmpl() {
}
}
+post_extract() {
+ # remove vendored wheels, these should come from (host)makedepends
+ rm -r python/wheels
+}
+
post_install() {
# qemu-bridge-helper must be setuid for non privileged users.
chmod u+s ${DESTDIR}/usr/libexec/qemu-bridge-helper
@@ -162,7 +169,10 @@ qemu-common_package() {
short_desc+=" - common files"
pkg_install() {
vmove usr/share
- vmove usr/include
+ # TCG plugins are deprecated on 32bit, so there are no headers to move
+ if [ "$XBPS_TARGET_WORDSIZE" -eq 64 ]; then
+ vmove usr/include
+ fi
vmove usr/libexec
}
}
From 783ae50209cd211da464a96bf4e7b47c7142ff09 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 13 Dec 2024 13:56:17 -0500
Subject: [PATCH 4/4] removed-packages: update to 0.1.20241213.
---
srcpkgs/removed-packages/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index b345554e637d11..7456f0183b5818 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,6 +1,6 @@
# Template file for 'removed-packages'
pkgname=removed-packages
-version=0.1.20241127
+version=0.1.20241213
revision=1
build_style=meta
short_desc="Uninstalls packages removed from repository"
@@ -89,9 +89,9 @@ replaces="
csync<=0.50.0_5
ctpp2-devel<=2.8.3_7
ctpp2<=2.8.3_7
- cura<=4.13.1
- cura-fdm-materials<=2019.08.21_1
cura-engine<=4.13.1_6
+ cura-fdm-materials<=2019.08.21_1
+ cura<=4.13.1
cycle<=0.3.2_2
deepin-calculator<=5.0.1_1
deepin-draw<=1.0.0_1
@@ -339,13 +339,13 @@ replaces="
ladish-devel<=1_11
ladish<=1_11
laditools<=1.1.0_3
- libArcus<=4.13.1_8
libArcus-devel<=4.13.1_8
libArcus-python3<=4.13.1_8
+ libArcus<=4.13.1_8
libCharon<=4.13.0_3
- libSavitar<=4.13.1_3
libSavitar-devel<=4.13.1_3
libSavitar-python3<=4.13.1_3
+ libSavitar<=4.13.1_3
libXevie<=1.0.3_8
libXfontcache<=1.0.5_2
libXxf86misc<=1.0.4_1
@@ -753,6 +753,8 @@ replaces="
python3-tables<=3.7.0_4
python3-txacme<=0.9.3_3
python3-typed-ast<=1.5.4_3
+ qemu-system-cris<=9.1.2_1
+ qemu-user-cris<=9.1.2_1
qimageblitz<=0.0.6_4
qqc2-desktop-style<=5.115.0_1
qt-designer-devel<=4.8.7_29
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: qemu: update to 9.2.0.
2024-12-13 18:57 [PR PATCH] qemu: update to 9.2.0 classabbyamp
` (4 preceding siblings ...)
2024-12-23 4:23 ` classabbyamp
@ 2024-12-23 17:55 ` classabbyamp
5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2024-12-23 17:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 515 bytes --]
There's a merged pull request on the void-packages repository
qemu: update to 9.2.0.
https://github.com/void-linux/void-packages/pull/53509
Description:
- **qemu-user: update to 9.2.0.**
- **qemu: update to 9.2.0.**
- **removed-packages: update to 0.1.20241213.**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **in progress**
**requires meson 1.5.0 https://github.com/void-linux/void-packages/pull/53322**
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-12-23 17:55 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-13 18:57 [PR PATCH] qemu: update to 9.2.0 classabbyamp
2024-12-15 18:35 ` [PR PATCH] [Updated] " classabbyamp
2024-12-15 18:35 ` [PR PATCH] [Closed]: " classabbyamp
2024-12-19 5:28 ` [PR PATCH] [Updated] " classabbyamp
2024-12-23 0:53 ` classabbyamp
2024-12-23 4:23 ` classabbyamp
2024-12-23 17:55 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).