From adb252ab11705aa7b957239875d5a51c0c8f85a0 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Wed, 25 Aug 2021 17:01:43 +0300 Subject: [PATCH] qemu: update to 6.1.0 --- .../0000-android-config-support.patch | 63 ++-------- .../0001-fix-hardcoded-paths.patch | 111 ++++++++---------- .../0009-fix-mman.h-defs.patch | 6 +- packages/qemu-system-x86-64-headless/build.sh | 23 ++-- ...qemu-system-aarch64-headless.subpackage.sh | 2 +- .../qemu-system-arm-headless.subpackage.sh | 2 +- .../qemu-system-i386-headless.subpackage.sh | 2 +- .../qemu-system-ppc-headless.subpackage.sh | 2 +- .../qemu-system-ppc64-headless.subpackage.sh | 2 +- ...qemu-system-riscv32-headless.subpackage.sh | 2 +- ...qemu-system-riscv64-headless.subpackage.sh | 2 +- .../qemu-user-aarch64.subpackage.sh | 2 +- .../qemu-user-arm.subpackage.sh | 2 +- .../qemu-user-i386.subpackage.sh | 2 +- .../qemu-user-ppc.subpackage.sh | 2 +- .../qemu-user-ppc64.subpackage.sh | 2 +- .../qemu-user-riscv32.subpackage.sh | 2 +- .../qemu-user-riscv64.subpackage.sh | 2 +- .../qemu-user-x86-64.subpackage.sh | 2 +- .../qemu-utils.subpackage.sh | 3 +- 20 files changed, 93 insertions(+), 143 deletions(-) diff --git a/packages/qemu-system-x86-64-headless/0000-android-config-support.patch b/packages/qemu-system-x86-64-headless/0000-android-config-support.patch index ce6a16623..a49c98888 100644 --- a/packages/qemu-system-x86-64-headless/0000-android-config-support.patch +++ b/packages/qemu-system-x86-64-headless/0000-android-config-support.patch @@ -1,53 +1,12 @@ -diff -uNr qemu-5.2.0/configure qemu-5.2.0.mod/configure ---- qemu-5.2.0/configure 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/configure 2020-12-09 16:24:26.073781672 +0200 -@@ -2931,6 +2931,8 @@ - fi +diff -uNr qemu-6.1.0/meson.build qemu-6.1.0.mod/meson.build +--- qemu-6.1.0/meson.build 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/meson.build 2021-08-25 16:17:56.185294702 +0300 +@@ -1508,7 +1508,7 @@ + } + endif - has_libgcrypt() { -+ return 0 -+ - if ! has "libgcrypt-config" - then - return 1 -@@ -3000,10 +3002,7 @@ - # Debian has removed -lgpg-error from libgcrypt-config - # as it "spreads unnecessary dependencies" which in - # turn breaks static builds... -- if test "$static" = "yes" -- then -- gcrypt_libs="$gcrypt_libs -lgpg-error" -- fi -+ gcrypt_libs="$gcrypt_libs -lgpg-error" - - # Link test to make sure the given libraries work (e.g for static). - write_c_skeleton -@@ -4097,6 +4096,7 @@ - if compile_prog "" "" ; then - signalfd=yes - fi -+signalfd=no - - # check if optreset global is declared by - optreset="no" -@@ -5973,6 +5973,7 @@ - if test "$darwin" = "yes" ; then - echo "CONFIG_DARWIN=y" >> $config_host_mak - fi -+ivshmem=no - - if test "$solaris" = "yes" ; then - echo "CONFIG_SOLARIS=y" >> $config_host_mak -@@ -6088,9 +6089,9 @@ - if test "$posix_fallocate" = "yes" ; then - echo "CONFIG_POSIX_FALLOCATE=y" >> $config_host_mak - fi --if test "$sync_file_range" = "yes" ; then -- echo "CONFIG_SYNC_FILE_RANGE=y" >> $config_host_mak --fi -+#if test "$sync_file_range" = "yes" ; then -+# echo "CONFIG_SYNC_FILE_RANGE=y" >> $config_host_mak -+#fi - if test "$fiemap" = "yes" ; then - echo "CONFIG_FIEMAP=y" >> $config_host_mak - fi +-have_ivshmem = config_host_data.get('CONFIG_EVENTFD') ++have_ivshmem = false + host_kconfig = \ + ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \ + ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \ diff --git a/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch b/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch index 0fd9ebbc7..a1f0d86e4 100644 --- a/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch +++ b/packages/qemu-system-x86-64-headless/0001-fix-hardcoded-paths.patch @@ -1,7 +1,7 @@ -diff -uNr qemu-5.2.0/block.c qemu-5.2.0.mod/block.c ---- qemu-5.2.0/block.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/block.c 2020-12-09 15:25:10.305910980 +0200 -@@ -763,7 +763,7 @@ +diff -uNr qemu-6.1.0/block.c qemu-6.1.0.mod/block.c +--- qemu-6.1.0/block.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/block.c 2021-08-25 15:22:26.469952602 +0300 +@@ -833,7 +833,7 @@ const char *tmpdir; tmpdir = getenv("TMPDIR"); if (!tmpdir) { @@ -10,11 +10,11 @@ diff -uNr qemu-5.2.0/block.c qemu-5.2.0.mod/block.c } if (snprintf(filename, size, "%s/vl.XXXXXX", tmpdir) >= size) { return -EOVERFLOW; -diff -uNr qemu-5.2.0/hw/hppa/machine.c qemu-5.2.0.mod/hw/hppa/machine.c ---- qemu-5.2.0/hw/hppa/machine.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/hw/hppa/machine.c 2020-12-09 15:27:27.518908660 +0200 +diff -uNr qemu-6.1.0/hw/hppa/machine.c qemu-6.1.0.mod/hw/hppa/machine.c +--- qemu-6.1.0/hw/hppa/machine.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/hw/hppa/machine.c 2021-08-25 15:22:26.469952602 +0300 @@ -100,19 +100,19 @@ - fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ram_size); + fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size); val = cpu_to_le64(MIN_SEABIOS_HPPA_VERSION); - fw_cfg_add_file(fw_cfg, "/etc/firmware-min-version", @@ -37,9 +37,9 @@ diff -uNr qemu-5.2.0/hw/hppa/machine.c qemu-5.2.0.mod/hw/hppa/machine.c g_memdup(&val, sizeof(val)), sizeof(val)); fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, ms->boot_order[0]); -diff -uNr qemu-5.2.0/hw/usb/ccid-card-emulated.c qemu-5.2.0.mod/hw/usb/ccid-card-emulated.c ---- qemu-5.2.0/hw/usb/ccid-card-emulated.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/hw/usb/ccid-card-emulated.c 2020-12-09 15:28:01.551157409 +0200 +diff -uNr qemu-6.1.0/hw/usb/ccid-card-emulated.c qemu-6.1.0.mod/hw/usb/ccid-card-emulated.c +--- qemu-6.1.0/hw/usb/ccid-card-emulated.c 2021-08-24 20:35:40.000000000 +0300 ++++ qemu-6.1.0.mod/hw/usb/ccid-card-emulated.c 2021-08-25 15:22:26.469952602 +0300 @@ -417,7 +417,7 @@ event_notifier_cleanup(&card->notifier); } @@ -49,10 +49,10 @@ diff -uNr qemu-5.2.0/hw/usb/ccid-card-emulated.c qemu-5.2.0.mod/hw/usb/ccid-card #define CERTIFICATES_ARGS_TEMPLATE\ "db=\"%s\" use_hw=no soft=(,Virtual Reader,CAC,,%s,%s,%s)" -diff -uNr qemu-5.2.0/linux-user/syscall.c qemu-5.2.0.mod/linux-user/syscall.c ---- qemu-5.2.0/linux-user/syscall.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/linux-user/syscall.c 2020-12-09 15:25:10.309911009 +0200 -@@ -8045,7 +8045,7 @@ +diff -uNr qemu-6.1.0/linux-user/syscall.c qemu-6.1.0.mod/linux-user/syscall.c +--- qemu-6.1.0/linux-user/syscall.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/linux-user/syscall.c 2021-08-25 15:22:26.477952648 +0300 +@@ -8018,7 +8018,7 @@ /* create temporary file to map stat to */ tmpdir = getenv("TMPDIR"); if (!tmpdir) @@ -61,9 +61,9 @@ diff -uNr qemu-5.2.0/linux-user/syscall.c qemu-5.2.0.mod/linux-user/syscall.c snprintf(filename, sizeof(filename), "%s/qemu-open.XXXXXX", tmpdir); fd = mkstemp(filename); if (fd < 0) { -diff -uNr qemu-5.2.0/migration/exec.c qemu-5.2.0.mod/migration/exec.c ---- qemu-5.2.0/migration/exec.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/migration/exec.c 2020-12-09 15:25:10.309911009 +0200 +diff -uNr qemu-6.1.0/migration/exec.c qemu-6.1.0.mod/migration/exec.c +--- qemu-6.1.0/migration/exec.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/migration/exec.c 2021-08-25 15:22:26.477952648 +0300 @@ -28,7 +28,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) { @@ -82,10 +82,10 @@ diff -uNr qemu-5.2.0/migration/exec.c qemu-5.2.0.mod/migration/exec.c trace_migration_exec_incoming(command); ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv, -diff -uNr qemu-5.2.0/net/tap.c qemu-5.2.0.mod/net/tap.c ---- qemu-5.2.0/net/tap.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/net/tap.c 2020-12-09 15:25:10.309911009 +0200 -@@ -533,7 +533,7 @@ +diff -uNr qemu-6.1.0/net/tap.c qemu-6.1.0.mod/net/tap.c +--- qemu-6.1.0/net/tap.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/net/tap.c 2021-08-25 15:22:26.481952669 +0300 +@@ -552,7 +552,7 @@ *parg++ = helper_cmd; *parg++ = NULL; @@ -94,10 +94,10 @@ diff -uNr qemu-5.2.0/net/tap.c qemu-5.2.0.mod/net/tap.c g_free(helper_cmd); } else { /* assume helper is just the executable path name */ -diff -uNr qemu-5.2.0/qemu-nbd.c qemu-5.2.0.mod/qemu-nbd.c ---- qemu-5.2.0/qemu-nbd.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/qemu-nbd.c 2020-12-09 15:25:10.313911038 +0200 -@@ -52,7 +52,6 @@ +diff -uNr qemu-6.1.0/qemu-nbd.c qemu-6.1.0.mod/qemu-nbd.c +--- qemu-6.1.0/qemu-nbd.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/qemu-nbd.c 2021-08-25 15:22:26.481952669 +0300 +@@ -53,7 +53,6 @@ #define HAVE_NBD_DEVICE 0 #endif @@ -105,7 +105,7 @@ diff -uNr qemu-5.2.0/qemu-nbd.c qemu-5.2.0.mod/qemu-nbd.c #define QEMU_NBD_OPT_CACHE 256 #define QEMU_NBD_OPT_AIO 257 #define QEMU_NBD_OPT_DISCARD 258 -@@ -91,7 +90,7 @@ +@@ -92,7 +91,7 @@ " -p, --port=PORT port to listen on (default `%d')\n" " -b, --bind=IFACE interface to bind to (default `0.0.0.0')\n" " -k, --socket=PATH path to the unix socket\n" @@ -114,7 +114,7 @@ diff -uNr qemu-5.2.0/qemu-nbd.c qemu-5.2.0.mod/qemu-nbd.c " -e, --shared=NUM device can be shared by NUM clients (default '1')\n" " -t, --persistent don't exit on the last connection\n" " -v, --verbose display extra debugging information\n" -@@ -964,7 +963,7 @@ +@@ -926,7 +925,7 @@ if (device != NULL && sockpath == NULL) { sockpath = g_malloc(128); @@ -123,31 +123,22 @@ diff -uNr qemu-5.2.0/qemu-nbd.c qemu-5.2.0.mod/qemu-nbd.c } server = qio_net_listener_new(); -diff -uNr qemu-5.2.0/slirp/src/slirp.c qemu-5.2.0.mod/slirp/src/slirp.c ---- qemu-5.2.0/slirp/src/slirp.c 2020-12-08 19:00:58.000000000 +0200 -+++ qemu-5.2.0.mod/slirp/src/slirp.c 2020-12-09 15:25:10.313911038 +0200 -@@ -133,7 +133,7 @@ - return 0; - } - old_stat = *cached_stat; -- if (stat("/etc/resolv.conf", cached_stat) != 0) { -+ if (stat("@TERMUX_PREFIX@/etc/resolv.conf", cached_stat) != 0) { - return -1; - } - if (cached_stat->st_dev == old_stat.st_dev && -@@ -157,7 +157,7 @@ - void *tmp_addr = alloca(addrlen); - unsigned if_index; +diff -uNr qemu-6.1.0/slirp/src/slirp.c qemu-6.1.0.mod/slirp/src/slirp.c +--- qemu-6.1.0/slirp/src/slirp.c 2021-08-24 20:36:28.000000000 +0300 ++++ qemu-6.1.0.mod/slirp/src/slirp.c 2021-08-25 15:23:17.110356661 +0300 +@@ -221,7 +221,7 @@ + #if defined(__HAIKU__) + #define RESOLV_CONF_PATH "/boot/system/settings/network/resolv.conf" + #else +-#define RESOLV_CONF_PATH "/etc/resolv.conf" ++#define RESOLV_CONF_PATH "@TERMUX_PREFIX@/etc/resolv.conf" + #endif -- f = fopen("/etc/resolv.conf", "r"); -+ f = fopen("@TERMUX_PREFIX@/etc/resolv.conf", "r"); - if (!f) - return -1; - -diff -uNr qemu-5.2.0/tcg/tcg.c qemu-5.2.0.mod/tcg/tcg.c ---- qemu-5.2.0/tcg/tcg.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/tcg/tcg.c 2020-12-09 15:25:10.313911038 +0200 -@@ -4628,7 +4628,8 @@ + static int get_dns_addr_cached(void *pdns_addr, void *cached_addr, +diff -uNr qemu-6.1.0/tcg/tcg.c qemu-6.1.0.mod/tcg/tcg.c +--- qemu-6.1.0/tcg/tcg.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/tcg/tcg.c 2021-08-25 15:22:26.485952693 +0300 +@@ -4684,7 +4684,8 @@ /* Enable this block to be able to debug the ELF image file creation. One can use readelf, objdump, or other inspection utilities. */ { @@ -157,10 +148,10 @@ diff -uNr qemu-5.2.0/tcg/tcg.c qemu-5.2.0.mod/tcg/tcg.c if (f) { if (fwrite(img, img_size, 1, f) != img_size) { /* Avoid stupid unused return value warning for fwrite. */ -diff -uNr qemu-5.2.0/util/module.c qemu-5.2.0.mod/util/module.c ---- qemu-5.2.0/util/module.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/util/module.c 2020-12-09 15:30:49.368390113 +0200 -@@ -246,7 +246,7 @@ +diff -uNr qemu-6.1.0/util/module.c qemu-6.1.0.mod/util/module.c +--- qemu-6.1.0/util/module.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/util/module.c 2021-08-25 15:22:26.485952693 +0300 +@@ -280,7 +280,7 @@ version_dir = g_strcanon(g_strdup(QEMU_PKGVERSION), G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "+-.~", '_'); @@ -169,10 +160,10 @@ diff -uNr qemu-5.2.0/util/module.c qemu-5.2.0.mod/util/module.c #endif assert(n_dirs <= ARRAY_SIZE(dirs)); -diff -uNr qemu-5.2.0/util/qemu-sockets.c qemu-5.2.0.mod/util/qemu-sockets.c ---- qemu-5.2.0/util/qemu-sockets.c 2020-12-08 18:59:44.000000000 +0200 -+++ qemu-5.2.0.mod/util/qemu-sockets.c 2020-12-09 15:25:10.313911038 +0200 -@@ -900,7 +900,7 @@ +diff -uNr qemu-6.1.0/util/qemu-sockets.c qemu-6.1.0.mod/util/qemu-sockets.c +--- qemu-6.1.0/util/qemu-sockets.c 2021-08-24 20:35:41.000000000 +0300 ++++ qemu-6.1.0.mod/util/qemu-sockets.c 2021-08-25 15:22:26.485952693 +0300 +@@ -923,7 +923,7 @@ path = saddr->path; } else { const char *tmpdir = getenv("TMPDIR"); diff --git a/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch b/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch index 1274337be..6ccf9b17c 100644 --- a/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch +++ b/packages/qemu-system-x86-64-headless/0009-fix-mman.h-defs.patch @@ -33,9 +33,9 @@ diff -uNr qemu-5.1.0/block/file-posix.c qemu-5.1.0.mod/block/file-posix.c #include #include #include -diff -uNr qemu-5.1.0/contrib/libvhost-user/libvhost-user.c qemu-5.1.0.mod/contrib/libvhost-user/libvhost-user.c ---- qemu-5.1.0/contrib/libvhost-user/libvhost-user.c 2020-08-11 22:17:15.000000000 +0300 -+++ qemu-5.1.0.mod/contrib/libvhost-user/libvhost-user.c 2020-09-05 17:06:07.327115262 +0300 +diff -uNr qemu/subprojects/libvhost-user/libvhost-user.c qemu.mod/subprojects/libvhost-user/libvhost-user.c +--- qemu/subprojects/libvhost-user/libvhost-user.c 2020-08-11 22:17:15.000000000 +0300 ++++ qemu.mod/subprojects/libvhost-user/libvhost-user.c 2020-09-05 17:06:07.327115262 +0300 @@ -29,6 +29,7 @@ #include "qemu/compiler.h" diff --git a/packages/qemu-system-x86-64-headless/build.sh b/packages/qemu-system-x86-64-headless/build.sh index 9ed86bb0a..1c973b764 100644 --- a/packages/qemu-system-x86-64-headless/build.sh +++ b/packages/qemu-system-x86-64-headless/build.sh @@ -2,11 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://www.qemu.org TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="Leonid Pliushch " -TERMUX_PKG_VERSION=1:5.2.0 -TERMUX_PKG_REVISION=11 +TERMUX_PKG_VERSION=1:6.1.0 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION:2}.tar.xz -TERMUX_PKG_SHA256="cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc" -TERMUX_PKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_PKG_SHA256=eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96 +TERMUX_PKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" + +# Required by configuration script, but I can't find any binary that uses it. +TERMUX_PKG_BUILD_DEPENDS="libtasn1" + TERMUX_PKG_CONFLICTS="qemu-system-x86_64-headless" TERMUX_PKG_REPLACES="qemu-system-x86_64-headless" TERMUX_PKG_PROVIDES="qemu-system-x86_64-headless" @@ -45,10 +48,6 @@ termux_step_configure() { CXXFLAGS+=" $CPPFLAGS" LDFLAGS+=" -landroid-shmem -llog" - cp "$TERMUX_PREFIX"/bin/libgcrypt-config \ - "$TERMUX_PKG_TMPDIR"/libgcrypt-config - export PATH="$PATH:$TERMUX_PKG_TMPDIR" - # Note: using --disable-stack-protector since stack protector # flags already passed by build scripts but we do not want to # override them with what QEMU configure provides. @@ -64,9 +63,8 @@ termux_step_configure() { --enable-coroutine-pool \ --enable-trace-backends=nop \ --disable-guest-agent \ - --disable-gnutls \ - --disable-nettle \ - --enable-gcrypt \ + --enable-gnutls \ + --enable-nettle \ --disable-sdl \ --disable-sdl-image \ --disable-gtk \ @@ -99,10 +97,11 @@ termux_step_configure() { --enable-dmg \ --enable-parallels \ --enable-qed \ - --enable-sheepdog \ --enable-spice \ --enable-libusb \ --enable-usb-redir \ + --disable-vhost-user \ + --disable-vhost-user-blk-server \ --target-list="$QEMU_TARGETS" } diff --git a/packages/qemu-system-x86-64-headless/qemu-system-aarch64-headless.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-system-aarch64-headless.subpackage.sh index dc7fb6e0e..f6b73d99f 100644 --- a/packages/qemu-system-x86-64-headless/qemu-system-aarch64-headless.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-system-aarch64-headless.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" -TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" diff --git a/packages/qemu-system-x86-64-headless/qemu-system-arm-headless.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-system-arm-headless.subpackage.sh index 5835ff4ed..697d7c8ef 100644 --- a/packages/qemu-system-x86-64-headless/qemu-system-arm-headless.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-system-arm-headless.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" -TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" diff --git a/packages/qemu-system-x86-64-headless/qemu-system-i386-headless.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-system-i386-headless.subpackage.sh index 36e1b53f2..1cd228b26 100644 --- a/packages/qemu-system-x86-64-headless/qemu-system-i386-headless.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-system-i386-headless.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" -TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" diff --git a/packages/qemu-system-x86-64-headless/qemu-system-ppc-headless.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-system-ppc-headless.subpackage.sh index df6f01995..f102a9af6 100644 --- a/packages/qemu-system-x86-64-headless/qemu-system-ppc-headless.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-system-ppc-headless.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" -TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" diff --git a/packages/qemu-system-x86-64-headless/qemu-system-ppc64-headless.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-system-ppc64-headless.subpackage.sh index d7cc3a878..57a6650cb 100644 --- a/packages/qemu-system-x86-64-headless/qemu-system-ppc64-headless.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-system-ppc64-headless.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" -TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" diff --git a/packages/qemu-system-x86-64-headless/qemu-system-riscv32-headless.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-system-riscv32-headless.subpackage.sh index 71b36d818..f8221949c 100644 --- a/packages/qemu-system-x86-64-headless/qemu-system-riscv32-headless.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-system-riscv32-headless.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" -TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" diff --git a/packages/qemu-system-x86-64-headless/qemu-system-riscv64-headless.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-system-riscv64-headless.subpackage.sh index 0e48ebf4d..cdc52428b 100644 --- a/packages/qemu-system-x86-64-headless/qemu-system-riscv64-headless.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-system-riscv64-headless.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (headless)" -TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, ncurses, qemu-common, resolv-conf, zlib, libspice-server, libusbredir" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, ncurses, qemu-common, resolv-conf, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-aarch64.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-aarch64.subpackage.sh index bbc2efa92..0f479ed8b 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-aarch64.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-aarch64.subpackage.sh @@ -1,4 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE="bin/qemu-aarch64" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-arm.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-arm.subpackage.sh index db32a7c41..841d7be13 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-arm.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-arm.subpackage.sh @@ -1,4 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE="bin/qemu-arm" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-i386.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-i386.subpackage.sh index a1734ce1b..03689af66 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-i386.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-i386.subpackage.sh @@ -1,4 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE="bin/qemu-i386" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-ppc.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-ppc.subpackage.sh index 5d72203a6..42d1fbc6f 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-ppc.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-ppc.subpackage.sh @@ -1,4 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE="bin/qemu-ppc" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-ppc64.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-ppc64.subpackage.sh index b3e9bb1a1..56ba5cf89 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-ppc64.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-ppc64.subpackage.sh @@ -1,4 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE="bin/qemu-ppc64" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-riscv32.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-riscv32.subpackage.sh index 0d475af25..71154300a 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-riscv32.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-riscv32.subpackage.sh @@ -1,4 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE="bin/qemu-riscv32" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-riscv64.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-riscv64.subpackage.sh index c7ffac577..629d65a0d 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-riscv64.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-riscv64.subpackage.sh @@ -1,4 +1,4 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE="bin/qemu-riscv64" diff --git a/packages/qemu-system-x86-64-headless/qemu-user-x86-64.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-user-x86-64.subpackage.sh index a00825cf2..e879aadc4 100644 --- a/packages/qemu-system-x86-64-headless/qemu-user-x86-64.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-user-x86-64.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="QEMU Linux user mode emulator" -TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgcrypt, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libc++, libgnutls, libpixman" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_BREAKS="qemu-user-x86_64" TERMUX_SUBPKG_REPLACES="qemu-user-x86_64" diff --git a/packages/qemu-system-x86-64-headless/qemu-utils.subpackage.sh b/packages/qemu-system-x86-64-headless/qemu-utils.subpackage.sh index 98dafab1c..b946f2c3f 100644 --- a/packages/qemu-system-x86-64-headless/qemu-utils.subpackage.sh +++ b/packages/qemu-system-x86-64-headless/qemu-utils.subpackage.sh @@ -1,5 +1,5 @@ TERMUX_SUBPKG_DESCRIPTION="A set of utilities for working with the QEMU emulators" -TERMUX_SUBPKG_DEPENDS="glib, libbz2, libcurl, libgcrypt, libnfs, libssh, zlib" +TERMUX_SUBPKG_DEPENDS="glib, libbz2, libcap-ng, libcurl, libgnutls, libnettle, libnfs, libpixman, libssh, zlib, zstd" TERMUX_SUBPKG_DEPEND_ON_PARENT=no TERMUX_SUBPKG_INCLUDE=" @@ -8,6 +8,7 @@ bin/qemu-edid bin/qemu-img bin/qemu-io bin/qemu-nbd +include/qemu-plugin.h share/man/man1/qemu-img.1.gz share/man/man8/qemu-nbd.8.gz "