diff options
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | qemu-7.0.0-glibc-2.36.patch | 43 |
3 files changed, 6 insertions, 73 deletions
@@ -1,6 +1,6 @@ pkgbase = qemu-git pkgdesc = A generic and open source machine emulator and virtualizer. Git version. - pkgver = 7.1.0.rc2.r0.g61b6e67171 + pkgver = 7.1.0.rc2.r2.ga6b1c53e79 pkgrel = 1 epoch = 16 url = https://wiki.qemu.org/ @@ -12,7 +12,6 @@ pkgbase = qemu-git makedepends = brltty makedepends = bzip2 makedepends = cairo - makedepends = ceph makedepends = curl makedepends = cdrtools makedepends = dtc @@ -70,11 +69,9 @@ pkgbase = qemu-git source = git://git.qemu.org/qemu.git source = qemu-guest-agent.service source = 65-kvm.rules - source = qemu-7.0.0-glibc-2.36.patch sha256sums = SKIP sha256sums = c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88 sha256sums = a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c - sha256sums = 1eee1b5d839fdfc5cd5a18f0c769b01228c14781de1368670e2c589cd6903a6e pkgname = qemu-git pkgdesc = QEMU Git version. @@ -332,13 +329,6 @@ pkgname = qemu-block-iscsi-git provides = qemu-block-iscsi conflicts = qemu-block-iscsi -pkgname = qemu-block-rbd-git - pkgdesc = QEMU RBD block module. Git version. - depends = glibc - depends = ceph-libs - provides = qemu-block-rbd - conflicts = qemu-block-rbd - pkgname = qemu-block-gluster-git pkgdesc = QEMU GlusterFS block module. Git version. depends = glibc @@ -12,11 +12,11 @@ pkgname=( qemu-headless-git qemu-arch-extra-git qemu-headless-arch-extra-git - qemu-block-{iscsi,rbd,gluster}-git + qemu-block-{iscsi,gluster}-git qemu-guest-agent-git ) pkgdesc="A generic and open source machine emulator and virtualizer. Git version." -pkgver=7.1.0.rc2.r0.g61b6e67171 +pkgver=7.1.0.rc2.r2.ga6b1c53e79 pkgrel=1 epoch=16 arch=(i686 x86_64) @@ -29,7 +29,6 @@ makedepends=( brltty bzip2 cairo - ceph curl cdrtools dtc @@ -86,12 +85,10 @@ makedepends=( ) source=(git://git.qemu.org/qemu.git qemu-guest-agent.service - 65-kvm.rules - qemu-7.0.0-glibc-2.36.patch) + 65-kvm.rules) sha256sums=('SKIP' 'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88' - 'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c' - '1eee1b5d839fdfc5cd5a18f0c769b01228c14781de1368670e2c589cd6903a6e') + 'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c') case $CARCH in i?86) _corearch=i386 ;; @@ -105,7 +102,6 @@ pkgver() { prepare() { cd "${srcdir}/${_gitname}" - patch -Np1 < ../qemu-7.0.0-glibc-2.36.patch mkdir build-{full,headless} mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu} } @@ -261,7 +257,6 @@ _package() { optdepends+=('ovmf: Tianocore UEFI firmware for qemu' 'samba: SMB/CIFS server support' 'qemu-block-iscsi-git: iSCSI block support' - 'qemu-block-rbd-git: RBD block support' 'qemu-block-gluster-git: glusterfs block support') install=qemu.install options=(!strip !emptydirs) @@ -282,7 +277,7 @@ _package() { chmod u+s qemu/qemu-bridge-helper # remove split block modules - rm qemu/block-{iscsi,rbd,gluster}.so + rm qemu/block-{iscsi,gluster}.so cd ../bin @@ -426,15 +421,6 @@ package_qemu-block-iscsi-git() { install -vDm 755 "$srcdir/$_gitname/build-full/block-iscsi.so" -t "$pkgdir/usr/lib/qemu/" } -package_qemu-block-rbd-git() { - pkgdesc="QEMU RBD block module. Git version." - depends=(glibc ceph-libs) - conflicts=(qemu-block-rbd) - provides=(qemu-block-rbd) - - install -vDm 755 "$srcdir/$_gitname/build-full/block-rbd.so" -t "$pkgdir/usr/lib/qemu/" -} - package_qemu-block-gluster-git() { pkgdesc="QEMU GlusterFS block module. Git version." depends=(glibc glusterfs) diff --git a/qemu-7.0.0-glibc-2.36.patch b/qemu-7.0.0-glibc-2.36.patch deleted file mode 100644 index 21b09da92cf2..000000000000 --- a/qemu-7.0.0-glibc-2.36.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index b27a6552aa..52d178afe7 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -95,7 +95,25 @@ - #include <linux/soundcard.h> - #include <linux/kd.h> - #include <linux/mtio.h> -+ -+#ifdef HAVE_SYS_MOUNT_FSCONFIG -+/* -+ * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, -+ * which in turn prevents use of linux/fs.h. So we have to -+ * define the constants ourselves for now. -+ */ -+#define FS_IOC_GETFLAGS _IOR('f', 1, long) -+#define FS_IOC_SETFLAGS _IOW('f', 2, long) -+#define FS_IOC_GETVERSION _IOR('v', 1, long) -+#define FS_IOC_SETVERSION _IOW('v', 2, long) -+#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) -+#define FS_IOC32_GETFLAGS _IOR('f', 1, int) -+#define FS_IOC32_SETFLAGS _IOW('f', 2, int) -+#define FS_IOC32_GETVERSION _IOR('v', 1, int) -+#define FS_IOC32_SETVERSION _IOW('v', 2, int) -+#else - #include <linux/fs.h> -+#endif - #include <linux/fd.h> - #if defined(CONFIG_FIEMAP) - #include <linux/fiemap.h> -diff --git a/meson.build b/meson.build -index 294e9a8f32..30a380752c 100644 ---- a/meson.build -+++ b/meson.build -@@ -1963,6 +1963,8 @@ config_host_data.set('HAVE_OPTRESET', - cc.has_header_symbol('getopt.h', 'optreset')) - config_host_data.set('HAVE_IPPROTO_MPTCP', - cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) -+config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', -+ cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) - - # has_member - config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', |