qemu: update to 6.1.0
This commit is contained in:
Leonid Pliushch
Yaksh Bariya
parent
04bd8f6c65
commit
fe9ff3eebe
|
|
@ -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 <getopt.h>
|
||||
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'] : []) + \
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
diff -uNr qemu-5.1.0/accel/tcg/translate-all.c qemu-5.1.0.mod/accel/tcg/translate-all.c
|
||||
--- qemu-5.1.0/accel/tcg/translate-all.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/accel/tcg/translate-all.c 2020-09-05 17:06:07.327115262 +0300
|
||||
@@ -47,6 +47,8 @@
|
||||
diff -uNr qemu-6.1.0/accel/tcg/translate-all.c qemu-6.1.0.mod/accel/tcg/translate-all.c
|
||||
--- qemu-6.1.0/accel/tcg/translate-all.c 2021-08-24 20:35:40.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/accel/tcg/translate-all.c 2021-08-25 18:17:55.882330894 +0300
|
||||
@@ -45,6 +45,8 @@
|
||||
#include "exec/ram_addr.h"
|
||||
#endif
|
||||
|
||||
+#include <linux/mman.h>
|
||||
+
|
||||
#include "exec/cputlb.h"
|
||||
#include "exec/tb-hash.h"
|
||||
#include "translate-all.h"
|
||||
diff -uNr qemu-5.1.0/audio/ossaudio.c qemu-5.1.0.mod/audio/ossaudio.c
|
||||
--- qemu-5.1.0/audio/ossaudio.c 2020-09-05 16:58:18.803736540 +0300
|
||||
+++ qemu-5.1.0.mod/audio/ossaudio.c 2020-09-05 17:06:07.327115262 +0300
|
||||
#include "exec/translate-all.h"
|
||||
#include "qemu/bitmap.h"
|
||||
diff -uNr qemu-6.1.0/audio/ossaudio.c qemu-6.1.0.mod/audio/ossaudio.c
|
||||
--- qemu-6.1.0/audio/ossaudio.c 2021-08-25 18:17:08.257953420 +0300
|
||||
+++ qemu-6.1.0.mod/audio/ossaudio.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -31,6 +31,8 @@
|
||||
#include "audio.h"
|
||||
#include "trace.h"
|
||||
|
|
@ -22,10 +22,10 @@ diff -uNr qemu-5.1.0/audio/ossaudio.c qemu-5.1.0.mod/audio/ossaudio.c
|
|||
#define AUDIO_CAP "oss"
|
||||
#include "audio_int.h"
|
||||
|
||||
diff -uNr qemu-5.1.0/block/file-posix.c qemu-5.1.0.mod/block/file-posix.c
|
||||
--- qemu-5.1.0/block/file-posix.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/block/file-posix.c 2020-09-05 17:06:07.327115262 +0300
|
||||
@@ -59,6 +59,7 @@
|
||||
diff -uNr qemu-6.1.0/block/file-posix.c qemu-6.1.0.mod/block/file-posix.c
|
||||
--- qemu-6.1.0/block/file-posix.c 2021-08-24 20:35:40.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/block/file-posix.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -63,6 +63,7 @@
|
||||
#include <sys/dkio.h>
|
||||
#endif
|
||||
#ifdef __linux__
|
||||
|
|
@ -33,20 +33,20 @@ diff -uNr qemu-5.1.0/block/file-posix.c qemu-5.1.0.mod/block/file-posix.c
|
|||
#include <sys/ioctl.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/syscall.h>
|
||||
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
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "qemu/compiler.h"
|
||||
diff -uNr qemu-6.1.0/hw/display/virtio-gpu-udmabuf.c qemu-6.1.0.mod/hw/display/virtio-gpu-udmabuf.c
|
||||
--- qemu-6.1.0/hw/display/virtio-gpu-udmabuf.c 2021-08-24 20:35:40.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/hw/display/virtio-gpu-udmabuf.c 2021-08-25 18:24:11.565310557 +0300
|
||||
@@ -11,6 +11,7 @@
|
||||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#if defined(__linux__)
|
||||
+#include <linux/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
diff -uNr qemu-5.1.0/hw/vfio/common.c qemu-5.1.0.mod/hw/vfio/common.c
|
||||
--- qemu-5.1.0/hw/vfio/common.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/hw/vfio/common.c 2020-09-05 17:06:07.331115270 +0300
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/units.h"
|
||||
#include "qemu-common.h"
|
||||
diff -uNr qemu-6.1.0/hw/vfio/common.c qemu-6.1.0.mod/hw/vfio/common.c
|
||||
--- qemu-6.1.0/hw/vfio/common.c 2021-08-24 20:35:40.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/hw/vfio/common.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <linux/kvm.h>
|
||||
#endif
|
||||
|
|
@ -55,9 +55,9 @@ diff -uNr qemu-5.1.0/hw/vfio/common.c qemu-5.1.0.mod/hw/vfio/common.c
|
|||
|
||||
#include "hw/vfio/vfio-common.h"
|
||||
#include "hw/vfio/vfio.h"
|
||||
diff -uNr qemu-5.1.0/hw/vfio/pci-quirks.c qemu-5.1.0.mod/hw/vfio/pci-quirks.c
|
||||
--- qemu-5.1.0/hw/vfio/pci-quirks.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/hw/vfio/pci-quirks.c 2020-09-05 17:07:16.623274533 +0300
|
||||
diff -uNr qemu-6.1.0/hw/vfio/pci-quirks.c qemu-6.1.0.mod/hw/vfio/pci-quirks.c
|
||||
--- qemu-6.1.0/hw/vfio/pci-quirks.c 2021-08-24 20:35:40.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/hw/vfio/pci-quirks.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -27,6 +27,8 @@
|
||||
#include "pci.h"
|
||||
#include "trace.h"
|
||||
|
|
@ -67,10 +67,10 @@ diff -uNr qemu-5.1.0/hw/vfio/pci-quirks.c qemu-5.1.0.mod/hw/vfio/pci-quirks.c
|
|||
/*
|
||||
* List of device ids/vendor ids for which to disable
|
||||
* option rom loading. This avoids the guest hangs during rom
|
||||
diff -uNr qemu-5.1.0/hw/virtio/vhost-user.c qemu-5.1.0.mod/hw/virtio/vhost-user.c
|
||||
--- qemu-5.1.0/hw/virtio/vhost-user.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/hw/virtio/vhost-user.c 2020-09-05 17:06:07.331115270 +0300
|
||||
@@ -32,6 +32,7 @@
|
||||
diff -uNr qemu-6.1.0/hw/virtio/vhost-user.c qemu-6.1.0.mod/hw/virtio/vhost-user.c
|
||||
--- qemu-6.1.0/hw/virtio/vhost-user.c 2021-08-24 20:35:40.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/hw/virtio/vhost-user.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -33,6 +33,7 @@
|
||||
#include "standard-headers/linux/vhost_types.h"
|
||||
|
||||
#ifdef CONFIG_LINUX
|
||||
|
|
@ -78,9 +78,20 @@ diff -uNr qemu-5.1.0/hw/virtio/vhost-user.c qemu-5.1.0.mod/hw/virtio/vhost-user.
|
|||
#include <linux/userfaultfd.h>
|
||||
#endif
|
||||
|
||||
diff -uNr qemu-5.1.0/linux-user/elfload.c qemu-5.1.0.mod/linux-user/elfload.c
|
||||
--- qemu-5.1.0/linux-user/elfload.c 2020-09-05 17:01:16.823064611 +0300
|
||||
+++ qemu-5.1.0.mod/linux-user/elfload.c 2020-09-05 17:06:07.331115270 +0300
|
||||
diff -uNr qemu-6.1.0/hw/virtio/vhost-vdpa.c qemu-6.1.0.mod/hw/virtio/vhost-vdpa.c
|
||||
--- qemu-6.1.0/hw/virtio/vhost-vdpa.c 2021-08-24 20:35:40.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/hw/virtio/vhost-vdpa.c 2021-08-25 18:20:52.511731435 +0300
|
||||
@@ -12,6 +12,7 @@
|
||||
#include "qemu/osdep.h"
|
||||
#include <linux/vhost.h>
|
||||
#include <linux/vfio.h>
|
||||
+#include <linux/mman.h>
|
||||
#include <sys/eventfd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include "hw/virtio/vhost.h"
|
||||
diff -uNr qemu-6.1.0/linux-user/elfload.c qemu-6.1.0.mod/linux-user/elfload.c
|
||||
--- qemu-6.1.0/linux-user/elfload.c 2021-08-25 18:17:08.281953611 +0300
|
||||
+++ qemu-6.1.0.mod/linux-user/elfload.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -2,6 +2,8 @@
|
||||
#include "qemu/osdep.h"
|
||||
#include <sys/param.h>
|
||||
|
|
@ -90,9 +101,9 @@ diff -uNr qemu-5.1.0/linux-user/elfload.c qemu-5.1.0.mod/linux-user/elfload.c
|
|||
#include <sys/resource.h>
|
||||
#include <sys/shm.h>
|
||||
|
||||
diff -uNr qemu-5.1.0/linux-user/flatload.c qemu-5.1.0.mod/linux-user/flatload.c
|
||||
--- qemu-5.1.0/linux-user/flatload.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/linux-user/flatload.c 2020-09-05 17:06:07.331115270 +0300
|
||||
diff -uNr qemu-6.1.0/linux-user/flatload.c qemu-6.1.0.mod/linux-user/flatload.c
|
||||
--- qemu-6.1.0/linux-user/flatload.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/linux-user/flatload.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -35,6 +35,8 @@
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
|
|
@ -102,9 +113,9 @@ diff -uNr qemu-5.1.0/linux-user/flatload.c qemu-5.1.0.mod/linux-user/flatload.c
|
|||
#include "qemu.h"
|
||||
#include "flat.h"
|
||||
#include "target_flat.h"
|
||||
diff -uNr qemu-5.1.0/linux-user/i386/cpu_loop.c qemu-5.1.0.mod/linux-user/i386/cpu_loop.c
|
||||
--- qemu-5.1.0/linux-user/i386/cpu_loop.c 2020-08-11 22:17:14.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/linux-user/i386/cpu_loop.c 2020-09-05 17:06:07.335115279 +0300
|
||||
diff -uNr qemu-6.1.0/linux-user/i386/cpu_loop.c qemu-6.1.0.mod/linux-user/i386/cpu_loop.c
|
||||
--- qemu-6.1.0/linux-user/i386/cpu_loop.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/linux-user/i386/cpu_loop.c 2021-08-25 18:17:55.890330957 +0300
|
||||
@@ -22,6 +22,8 @@
|
||||
#include "qemu.h"
|
||||
#include "cpu_loop-common.h"
|
||||
|
|
@ -114,9 +125,9 @@ diff -uNr qemu-5.1.0/linux-user/i386/cpu_loop.c qemu-5.1.0.mod/linux-user/i386/c
|
|||
/***********************************************************/
|
||||
/* CPUX86 core interface */
|
||||
|
||||
diff -uNr qemu-5.1.0/linux-user/mmap.c qemu-5.1.0.mod/linux-user/mmap.c
|
||||
--- qemu-5.1.0/linux-user/mmap.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/linux-user/mmap.c 2020-09-05 17:06:40.807186551 +0300
|
||||
diff -uNr qemu-6.1.0/linux-user/mmap.c qemu-6.1.0.mod/linux-user/mmap.c
|
||||
--- qemu-6.1.0/linux-user/mmap.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/linux-user/mmap.c 2021-08-25 18:17:55.890330957 +0300
|
||||
@@ -21,6 +21,8 @@
|
||||
#include "exec/log.h"
|
||||
#include "qemu.h"
|
||||
|
|
@ -126,9 +137,9 @@ diff -uNr qemu-5.1.0/linux-user/mmap.c qemu-5.1.0.mod/linux-user/mmap.c
|
|||
static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
static __thread int mmap_lock_count;
|
||||
|
||||
diff -uNr qemu-5.1.0/linux-user/syscall.c qemu-5.1.0.mod/linux-user/syscall.c
|
||||
--- qemu-5.1.0/linux-user/syscall.c 2020-09-05 17:02:57.910949156 +0300
|
||||
+++ qemu-5.1.0.mod/linux-user/syscall.c 2020-09-05 17:06:07.335115279 +0300
|
||||
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-25 18:17:08.285953643 +0300
|
||||
+++ qemu-6.1.0.mod/linux-user/syscall.c 2021-08-25 18:17:55.890330957 +0300
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <sys/resource.h>
|
||||
#include <sys/swap.h>
|
||||
|
|
@ -137,78 +148,21 @@ diff -uNr qemu-5.1.0/linux-user/syscall.c qemu-5.1.0.mod/linux-user/syscall.c
|
|||
#include <sched.h>
|
||||
#include <sys/timex.h>
|
||||
#include <sys/socket.h>
|
||||
diff -uNr qemu-5.1.0/migration/postcopy-ram.c qemu-5.1.0.mod/migration/postcopy-ram.c
|
||||
--- qemu-5.1.0/migration/postcopy-ram.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/migration/postcopy-ram.c 2020-09-05 17:06:07.335115279 +0300
|
||||
@@ -31,6 +31,8 @@
|
||||
#include "trace.h"
|
||||
diff -uNr qemu-6.1.0/migration/postcopy-ram.c qemu-6.1.0.mod/migration/postcopy-ram.c
|
||||
--- qemu-6.1.0/migration/postcopy-ram.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/migration/postcopy-ram.c 2021-08-25 18:17:55.894330989 +0300
|
||||
@@ -33,6 +33,8 @@
|
||||
#include "hw/boards.h"
|
||||
#include "exec/ramblock.h"
|
||||
|
||||
+#include <linux/mman.h>
|
||||
+
|
||||
/* Arbitrary limit on size of each discard command,
|
||||
* keeps them around ~200 bytes
|
||||
*/
|
||||
diff -uNr qemu-5.1.0/util/memfd.c qemu-5.1.0.mod/util/memfd.c
|
||||
--- qemu-5.1.0/util/memfd.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/util/memfd.c 2020-09-05 17:06:07.335115279 +0300
|
||||
@@ -32,6 +32,7 @@
|
||||
#include "qemu/host-utils.h"
|
||||
|
||||
#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
|
||||
+#include <linux/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <asm/unistd.h>
|
||||
|
||||
diff -uNr qemu-5.1.0/util/mmap-alloc.c qemu-5.1.0.mod/util/mmap-alloc.c
|
||||
--- qemu-5.1.0/util/mmap-alloc.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/util/mmap-alloc.c 2020-09-05 17:06:07.335115279 +0300
|
||||
@@ -10,7 +10,7 @@
|
||||
* later. See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
-#ifdef CONFIG_LINUX
|
||||
+#ifdef __linux__
|
||||
#include <linux/mman.h>
|
||||
#else /* !CONFIG_LINUX */
|
||||
#define MAP_SYNC 0x0
|
||||
diff -uNr qemu-5.1.0/util/oslib-posix.c qemu-5.1.0.mod/util/oslib-posix.c
|
||||
--- qemu-5.1.0/util/oslib-posix.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/util/oslib-posix.c 2020-09-05 17:06:07.335115279 +0300
|
||||
@@ -41,6 +41,7 @@
|
||||
#include "qemu/cutils.h"
|
||||
|
||||
#ifdef CONFIG_LINUX
|
||||
+#include <linux/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
#endif
|
||||
|
||||
diff -uNr qemu-5.1.0/util/vfio-helpers.c qemu-5.1.0.mod/util/vfio-helpers.c
|
||||
--- qemu-5.1.0/util/vfio-helpers.c 2020-08-11 22:17:15.000000000 +0300
|
||||
+++ qemu-5.1.0.mod/util/vfio-helpers.c 2020-09-05 17:06:07.335115279 +0300
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "qemu/osdep.h"
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/vfio.h>
|
||||
+#include <linux/mman.h>
|
||||
#include "qapi/error.h"
|
||||
#include "exec/ramlist.h"
|
||||
#include "exec/cpu-common.h"
|
||||
diff -uNr qemu-5.2.0/tests/vhost-user-bridge.c qemu-5.2.0.mod/tests/vhost-user-bridge.c
|
||||
--- qemu-5.2.0/tests/vhost-user-bridge.c 2020-12-08 18:59:44.000000000 +0200
|
||||
+++ qemu-5.2.0.mod/tests/vhost-user-bridge.c 2020-12-09 17:31:52.039910511 +0200
|
||||
@@ -29,6 +29,8 @@
|
||||
|
||||
#define _FILE_OFFSET_BITS 64
|
||||
|
||||
+#include <linux/mman.h>
|
||||
+
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/atomic.h"
|
||||
#include "qemu/ctype.h"
|
||||
diff -uNr qemu-5.2.0/softmmu/physmem.c qemu-5.2.0.mod/softmmu/physmem.c
|
||||
--- qemu-5.2.0/softmmu/physmem.c 2020-12-08 18:59:44.000000000 +0200
|
||||
+++ qemu-5.2.0.mod/softmmu/physmem.c 2020-12-09 17:05:25.872459520 +0200
|
||||
diff -uNr qemu-6.1.0/softmmu/physmem.c qemu-6.1.0.mod/softmmu/physmem.c
|
||||
--- qemu-6.1.0/softmmu/physmem.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/softmmu/physmem.c 2021-08-25 18:17:55.894330989 +0300
|
||||
@@ -17,6 +17,8 @@
|
||||
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
|
@ -218,3 +172,82 @@ diff -uNr qemu-5.2.0/softmmu/physmem.c qemu-5.2.0.mod/softmmu/physmem.c
|
|||
#include "qemu/osdep.h"
|
||||
#include "qemu-common.h"
|
||||
#include "qapi/error.h"
|
||||
diff -uNr qemu-6.1.0/subprojects/libvhost-user/libvhost-user.c qemu-6.1.0.mod/subprojects/libvhost-user/libvhost-user.c
|
||||
--- qemu-6.1.0/subprojects/libvhost-user/libvhost-user.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/subprojects/libvhost-user/libvhost-user.c 2021-08-25 18:17:55.886330925 +0300
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <endian.h>
|
||||
|
||||
#if defined(__linux__)
|
||||
+#include <linux/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
diff -uNr qemu-6.1.0/tcg/region.c qemu-6.1.0.mod/tcg/region.c
|
||||
--- qemu-6.1.0/tcg/region.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/tcg/region.c 2021-08-25 18:17:46.146253714 +0300
|
||||
@@ -22,6 +22,7 @@
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
+#include <linux/mman.h>
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/units.h"
|
||||
#include "qapi/error.h"
|
||||
diff -uNr qemu-6.1.0/tests/vhost-user-bridge.c qemu-6.1.0.mod/tests/vhost-user-bridge.c
|
||||
--- qemu-6.1.0/tests/vhost-user-bridge.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/tests/vhost-user-bridge.c 2021-08-25 18:17:55.894330989 +0300
|
||||
@@ -29,6 +29,8 @@
|
||||
|
||||
#define _FILE_OFFSET_BITS 64
|
||||
|
||||
+#include <linux/mman.h>
|
||||
+
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/atomic.h"
|
||||
#include "qemu/ctype.h"
|
||||
diff -uNr qemu-6.1.0/util/memfd.c qemu-6.1.0.mod/util/memfd.c
|
||||
--- qemu-6.1.0/util/memfd.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/util/memfd.c 2021-08-25 18:17:55.894330989 +0300
|
||||
@@ -32,6 +32,7 @@
|
||||
#include "qemu/host-utils.h"
|
||||
|
||||
#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
|
||||
+#include <linux/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <asm/unistd.h>
|
||||
|
||||
diff -uNr qemu-6.1.0/util/mmap-alloc.c qemu-6.1.0.mod/util/mmap-alloc.c
|
||||
--- qemu-6.1.0/util/mmap-alloc.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/util/mmap-alloc.c 2021-08-25 18:17:55.894330989 +0300
|
||||
@@ -10,7 +10,7 @@
|
||||
* later. See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
-#ifdef CONFIG_LINUX
|
||||
+#ifdef __linux__
|
||||
#include <linux/mman.h>
|
||||
#else /* !CONFIG_LINUX */
|
||||
#define MAP_SYNC 0x0
|
||||
diff -uNr qemu-6.1.0/util/oslib-posix.c qemu-6.1.0.mod/util/oslib-posix.c
|
||||
--- qemu-6.1.0/util/oslib-posix.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/util/oslib-posix.c 2021-08-25 18:17:55.894330989 +0300
|
||||
@@ -42,6 +42,7 @@
|
||||
#include "qemu/compiler.h"
|
||||
|
||||
#ifdef CONFIG_LINUX
|
||||
+#include <linux/mman.h>
|
||||
#include <sys/syscall.h>
|
||||
#endif
|
||||
|
||||
diff -uNr qemu-6.1.0/util/vfio-helpers.c qemu-6.1.0.mod/util/vfio-helpers.c
|
||||
--- qemu-6.1.0/util/vfio-helpers.c 2021-08-24 20:35:41.000000000 +0300
|
||||
+++ qemu-6.1.0.mod/util/vfio-helpers.c 2021-08-25 18:17:55.894330989 +0300
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "qemu/osdep.h"
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/vfio.h>
|
||||
+#include <linux/mman.h>
|
||||
#include "qapi/error.h"
|
||||
#include "exec/ramlist.h"
|
||||
#include "exec/cpu-common.h"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
diff -uNr qemu-5.2.0/linux-user/main.c qemu-5.2.0.mod/linux-user/main.c
|
||||
--- qemu-5.2.0/linux-user/main.c 2020-12-08 18:59:44.000000000 +0200
|
||||
+++ qemu-5.2.0.mod/linux-user/main.c 2020-12-24 17:41:07.982481916 +0200
|
||||
@@ -770,7 +770,13 @@
|
||||
* If we're in a chroot with no /proc, fall back to 1 page.
|
||||
*/
|
||||
if (mmap_min_addr == 0) {
|
||||
+#ifdef __ANDROID__
|
||||
+ // Go with 8 pages (32768 bytes) as default value for Android (Termux).
|
||||
+ // Issue https://github.com/termux/termux-packages/issues/6172.
|
||||
+ mmap_min_addr = qemu_host_page_size * 8;
|
||||
+#else
|
||||
mmap_min_addr = qemu_host_page_size;
|
||||
+#endif
|
||||
qemu_log_mask(CPU_LOG_PAGE,
|
||||
"host mmap_min_addr=0x%lx (fallback)\n",
|
||||
mmap_min_addr);
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff -uNr qemu-6.1.0/meson.build qemu-6.1.0.mod/meson.build
|
||||
--- qemu-6.1.0/meson.build 2021-08-25 21:20:39.873631512 +0300
|
||||
+++ qemu-6.1.0.mod/meson.build 2021-08-25 21:21:35.135670419 +0300
|
||||
@@ -1411,11 +1411,6 @@
|
||||
#include <sys/mman.h>
|
||||
#include <stddef.h>
|
||||
int main(void) { return posix_madvise(NULL, 0, POSIX_MADV_DONTNEED); }'''))
|
||||
-config_host_data.set('CONFIG_SIGNALFD', cc.links(gnu_source_prefix + '''
|
||||
- #include <unistd.h>
|
||||
- #include <sys/syscall.h>
|
||||
- #include <signal.h>
|
||||
- int main(void) { return syscall(SYS_signalfd, -1, NULL, _NSIG / 8); }'''))
|
||||
config_host_data.set('CONFIG_SPLICE', cc.links(gnu_source_prefix + '''
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
|
|
@ -1,16 +1,14 @@
|
|||
TERMUX_PKG_HOMEPAGE=https://www.qemu.org
|
||||
TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_PKG_LICENSE="LGPL-2.1"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=1:5.2.0
|
||||
TERMUX_PKG_REVISION=11
|
||||
TERMUX_PKG_MAINTAINER="Leonid Pliushch <leonid.pliushch@gmail.com>"
|
||||
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, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, libspice-server, libusbredir"
|
||||
TERMUX_PKG_CONFLICTS="qemu-system-x86_64, qemu-system-x86_64-headless, qemu-system-x86-64-headless"
|
||||
TERMUX_PKG_REPLACES="qemu-system-x86_64, qemu-system-x86_64-headless, qemu-system-x86-64-headless"
|
||||
TERMUX_PKG_PROVIDES="qemu-system-x86_64"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
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, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
|
||||
# Required by configuration script, but I can't find any binary that uses it.
|
||||
TERMUX_PKG_BUILD_DEPENDS="libtasn1"
|
||||
|
||||
# Remove files already present in qemu-utils and qemu-common.
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="
|
||||
|
|
@ -36,6 +34,11 @@ share/man/man8/qemu-pr-helper.8*
|
|||
share/qemu
|
||||
"
|
||||
|
||||
TERMUX_PKG_CONFLICTS="qemu-system-x86_64, qemu-system-x86_64-headless, qemu-system-x86-64-headless"
|
||||
TERMUX_PKG_REPLACES="qemu-system-x86_64, qemu-system-x86_64-headless, qemu-system-x86-64-headless"
|
||||
TERMUX_PKG_PROVIDES="qemu-system-x86_64"
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
|
||||
termux_step_configure() {
|
||||
termux_setup_ninja
|
||||
|
||||
|
|
@ -49,6 +52,8 @@ termux_step_configure() {
|
|||
QEMU_TARGETS+="aarch64-softmmu,"
|
||||
QEMU_TARGETS+="arm-softmmu,"
|
||||
QEMU_TARGETS+="i386-softmmu,"
|
||||
QEMU_TARGETS+="ppc64-softmmu,"
|
||||
QEMU_TARGETS+="ppc-softmmu,"
|
||||
QEMU_TARGETS+="riscv32-softmmu,"
|
||||
QEMU_TARGETS+="riscv64-softmmu,"
|
||||
QEMU_TARGETS+="x86_64-softmmu"
|
||||
|
|
@ -57,10 +62,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.
|
||||
|
|
@ -77,9 +78,8 @@ termux_step_configure() {
|
|||
--audio-drv-list=sdl \
|
||||
--enable-trace-backends=nop \
|
||||
--disable-guest-agent \
|
||||
--disable-gnutls \
|
||||
--disable-nettle \
|
||||
--enable-gcrypt \
|
||||
--enable-gnutls \
|
||||
--enable-nettle \
|
||||
--enable-sdl \
|
||||
--enable-sdl-image \
|
||||
--disable-gtk \
|
||||
|
|
@ -112,10 +112,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"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, 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, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
TERMUX_SUBPKG_CONFLICTS="qemu-system-aarch64-headless"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, 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, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
TERMUX_SUBPKG_CONFLICTS="qemu-system-arm-headless"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, 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, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
TERMUX_SUBPKG_CONFLICTS="qemu-system-i386-headless"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
TERMUX_SUBPKG_CONFLICTS="qemu-system-ppc-headless"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
|
||||
|
||||
TERMUX_SUBPKG_INCLUDE="
|
||||
bin/qemu-system-ppc
|
||||
share/man/man1/qemu-system-ppc.1.gz
|
||||
"
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_SUBPKG_DEPENDS="glib, libbz2, libc++, libcurl, libgnutls, libiconv, libjpeg-turbo, liblzo, libnettle, libnfs, libpixman, libpng, libspice-server, libssh, libusb, libusbredir, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
TERMUX_SUBPKG_CONFLICTS="qemu-system-ppc64-headless"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
|
||||
|
||||
TERMUX_SUBPKG_INCLUDE="
|
||||
bin/qemu-system-ppc64
|
||||
share/man/man1/qemu-system-ppc64.1.gz
|
||||
"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, 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, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
TERMUX_SUBPKG_CONFLICTS="qemu-system-riscv32-headless"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer"
|
||||
TERMUX_SUBPKG_DEPENDS="attr, glib, libbz2, libc++, libcap-ng, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, 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, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib, zstd"
|
||||
TERMUX_SUBPKG_CONFLICTS="qemu-system-riscv64-headless"
|
||||
TERMUX_SUBPKG_DEPEND_ON_PARENT=no
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue