From f655924d36cc438629494c8d3689b6179448710d Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 17 Sep 2018 21:35:10 +0300 Subject: [PATCH] qemu-system: properly split QEMU stuff between packages This includes package renaming: qemu-system --> qemu-system-x86_64 --- .../{qemu-system => qemu-system-x86_64}/build.sh | 8 +++++--- .../qemu-2.12.1_audio_ossaudio.c.patch} | 6 +++--- .../qemu-2.12.1_block.c.patch} | 6 +++--- .../qemu-2.12.1_block_cloop.c.patch} | 6 +++--- .../qemu-2.12.1_configure.patch} | 16 ++++++++-------- ...u-2.12.1_contrib_ivshmem-client_main.c.patch} | 6 +++--- ...u-2.12.1_contrib_ivshmem-server_main.c.patch} | 6 +++--- ...emu-2.12.1_hw_usb_ccid-card-emulated.c.patch} | 6 +++--- ...qemu-2.12.1_hw_xenpv_xen_domainbuild.c.patch} | 6 +++--- .../qemu-2.12.1_include_net_net.h.patch} | 6 +++--- .../qemu-2.12.1_linux-user_signal.c.patch} | 6 +++--- .../qemu-2.12.1_linux-user_strace.c.patch} | 6 +++--- .../qemu-2.12.1_linux-user_syscall.c.patch} | 6 +++--- .../qemu-2.12.1_linux-user_syscall_defs.h.patch} | 6 +++--- .../qemu-2.12.1_lockf_implementation.h.patch} | 6 +++--- .../qemu-2.12.1_migration_exec.c.patch} | 6 +++--- .../qemu-2.12.1_net_tap.c.patch} | 8 ++++---- .../qemu-2.12.1_os-posix.c.patch | 11 +++++++++++ .../qemu-2.12.1_qemu-nbd.c.patch} | 6 +++--- .../qemu-2.12.1_qga_main.c.patch} | 6 +++--- .../qemu-2.12.1_scsi_qemu-pr-helper.c.patch | 12 ++++++++++++ .../qemu-2.12.1_slirp_misc.c.patch} | 6 +++--- .../qemu-2.12.1_slirp_slirp.c.patch} | 6 +++--- .../qemu-2.12.1_tcg_i386_tcg-target.inc.c.patch} | 6 +++--- .../qemu-2.12.1_tcg_tcg.c.patch} | 8 ++++---- .../qemu-2.12.1_util_qemu-sockets.c.patch} | 6 +++--- .../qemu-system-x86_64/qemu-common.subpackage.sh | 11 +++++++++++ .../qemu-system-aarch64.subpackage.sh | 7 +++++++ .../qemu-system-arm.subpackage.sh | 7 +++++++ .../qemu-system-i386.subpackage.sh | 7 +++++++ .../qemu-user-aarch64.subpackage.sh | 3 +++ .../qemu-user-arm.subpackage.sh | 3 +++ .../qemu-user-i386.subpackage.sh | 3 +++ .../qemu-user-x86_64.subpackage.sh | 3 +++ .../qemu-system-x86_64/qemu-utils.subpackage.sh | 9 +++++++++ .../qemu-system/qemu-2.12.0_os-posix.c.patch | 11 ----------- ....12.0_roms_openbios_arch_unix_plugins.c.patch | 12 ------------ ...oms_openbios_arch_unix_plugins_loader.c.patch | 12 ------------ ...12.0_roms_seabios_scripts_kconfig_lkc.h.patch | 12 ------------ ..._external_opal-prd_test_test_pnor_ops.c.patch | 12 ------------ .../qemu-2.12.0_scsi_qemu-pr-helper.c.patch | 12 ------------ .../qemu-system-aarch64.subpackage.sh | 7 ------- .../qemu-system/qemu-system-arm.subpackage.sh | 7 ------- 43 files changed, 157 insertions(+), 164 deletions(-) rename x11-packages/{qemu-system => qemu-system-x86_64}/build.sh (92%) rename x11-packages/{qemu-system/qemu-2.12.0_audio_ossaudio.c.patch => qemu-system-x86_64/qemu-2.12.1_audio_ossaudio.c.patch} (53%) rename x11-packages/{qemu-system/qemu-2.12.0_block.c.patch => qemu-system-x86_64/qemu-2.12.1_block.c.patch} (60%) rename x11-packages/{qemu-system/qemu-2.12.0_block_cloop.c.patch => qemu-system-x86_64/qemu-2.12.1_block_cloop.c.patch} (66%) rename x11-packages/{qemu-system/qemu-2.12.0_configure.patch => qemu-system-x86_64/qemu-2.12.1_configure.patch} (86%) rename x11-packages/{qemu-system/qemu-2.12.0_contrib_ivshmem-client_main.c.patch => qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-client_main.c.patch} (59%) rename x11-packages/{qemu-system/qemu-2.12.0_contrib_ivshmem-server_main.c.patch => qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-server_main.c.patch} (73%) rename x11-packages/{qemu-system/qemu-2.12.0_hw_usb_ccid-card-emulated.c.patch => qemu-system-x86_64/qemu-2.12.1_hw_usb_ccid-card-emulated.c.patch} (58%) rename x11-packages/{qemu-system/qemu-2.12.0_hw_xenpv_xen_domainbuild.c.patch => qemu-system-x86_64/qemu-2.12.1_hw_xenpv_xen_domainbuild.c.patch} (59%) rename x11-packages/{qemu-system/qemu-2.12.0_include_net_net.h.patch => qemu-system-x86_64/qemu-2.12.1_include_net_net.h.patch} (71%) rename x11-packages/{qemu-system/qemu-2.12.0_linux-user_signal.c.patch => qemu-system-x86_64/qemu-2.12.1_linux-user_signal.c.patch} (87%) rename x11-packages/{qemu-system/qemu-2.12.0_linux-user_strace.c.patch => qemu-system-x86_64/qemu-2.12.1_linux-user_strace.c.patch} (52%) rename x11-packages/{qemu-system/qemu-2.12.0_linux-user_syscall.c.patch => qemu-system-x86_64/qemu-2.12.1_linux-user_syscall.c.patch} (96%) rename x11-packages/{qemu-system/qemu-2.12.0_linux-user_syscall_defs.h.patch => qemu-system-x86_64/qemu-2.12.1_linux-user_syscall_defs.h.patch} (82%) rename x11-packages/{qemu-system/qemu-2.12.0_lockf_implementation.h.patch => qemu-system-x86_64/qemu-2.12.1_lockf_implementation.h.patch} (86%) rename x11-packages/{qemu-system/qemu-2.12.0_migration_exec.c.patch => qemu-system-x86_64/qemu-2.12.1_migration_exec.c.patch} (78%) rename x11-packages/{qemu-system/qemu-2.12.0_net_tap.c.patch => qemu-system-x86_64/qemu-2.12.1_net_tap.c.patch} (54%) create mode 100644 x11-packages/qemu-system-x86_64/qemu-2.12.1_os-posix.c.patch rename x11-packages/{qemu-system/qemu-2.12.0_qemu-nbd.c.patch => qemu-system-x86_64/qemu-2.12.1_qemu-nbd.c.patch} (64%) rename x11-packages/{qemu-system/qemu-2.12.0_qga_main.c.patch => qemu-system-x86_64/qemu-2.12.1_qga_main.c.patch} (52%) create mode 100644 x11-packages/qemu-system-x86_64/qemu-2.12.1_scsi_qemu-pr-helper.c.patch rename x11-packages/{qemu-system/qemu-2.12.0_slirp_misc.c.patch => qemu-system-x86_64/qemu-2.12.1_slirp_misc.c.patch} (50%) rename x11-packages/{qemu-system/qemu-2.12.0_slirp_slirp.c.patch => qemu-system-x86_64/qemu-2.12.1_slirp_slirp.c.patch} (72%) rename x11-packages/{qemu-system/qemu-2.12.0_tcg_i386_tcg-target.inc.c.patch => qemu-system-x86_64/qemu-2.12.1_tcg_i386_tcg-target.inc.c.patch} (67%) rename x11-packages/{qemu-system/qemu-2.12.0_tcg_tcg.c.patch => qemu-system-x86_64/qemu-2.12.1_tcg_tcg.c.patch} (67%) rename x11-packages/{qemu-system/qemu-2.12.0_util_qemu-sockets.c.patch => qemu-system-x86_64/qemu-2.12.1_util_qemu-sockets.c.patch} (61%) create mode 100644 x11-packages/qemu-system-x86_64/qemu-common.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-user-aarch64.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-user-arm.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-user-i386.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-user-x86_64.subpackage.sh create mode 100644 x11-packages/qemu-system-x86_64/qemu-utils.subpackage.sh delete mode 100644 x11-packages/qemu-system/qemu-2.12.0_os-posix.c.patch delete mode 100644 x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins.c.patch delete mode 100644 x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins_loader.c.patch delete mode 100644 x11-packages/qemu-system/qemu-2.12.0_roms_seabios_scripts_kconfig_lkc.h.patch delete mode 100644 x11-packages/qemu-system/qemu-2.12.0_roms_skiboot_external_opal-prd_test_test_pnor_ops.c.patch delete mode 100644 x11-packages/qemu-system/qemu-2.12.0_scsi_qemu-pr-helper.c.patch delete mode 100644 x11-packages/qemu-system/qemu-system-aarch64.subpackage.sh delete mode 100644 x11-packages/qemu-system/qemu-system-arm.subpackage.sh diff --git a/x11-packages/qemu-system/build.sh b/x11-packages/qemu-system-x86_64/build.sh similarity index 92% rename from x11-packages/qemu-system/build.sh rename to x11-packages/qemu-system-x86_64/build.sh index 6830c68c1..aad42b16e 100644 --- a/x11-packages/qemu-system/build.sh +++ b/x11-packages/qemu-system-x86_64/build.sh @@ -1,11 +1,11 @@ TERMUX_PKG_MAINTAINER="Leonid Plyushch @xeffyr" TERMUX_PKG_HOMEPAGE=https://www.qemu.org -TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (i386, x86_64 targets)" +TERMUX_PKG_DESCRIPTION="A generic and open source machine emulator (x86_64)" TERMUX_PKG_VERSION=2.12.1 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SHA256=33583800e0006cd00b78226b85be5a27c8e3b156bed2e60e83ecbeb7b9b8364f -TERMUX_PKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses" +TERMUX_PKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_RM_AFTER_INSTALL=" @@ -14,6 +14,8 @@ share/man/man8 " termux_step_configure() { + local ENABLED_TARGETS="aarch64-softmmu,arm-softmmu,i386-softmmu,x86_64-softmmu,aarch64-linux-user,arm-linux-user,i386-linux-user,x86_64-linux-user" + ./configure --prefix="${TERMUX_PREFIX}" \ --cross-prefix="${CC//clang}" \ --cc="${CC}" \ @@ -50,7 +52,7 @@ termux_step_configure() { --enable-libssh2 \ --disable-jemalloc \ --disable-libxml2 \ - --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,x86_64-softmmu + --target-list="${ENABLED_TARGETS}" } termux_step_post_make_install() { diff --git a/x11-packages/qemu-system/qemu-2.12.0_audio_ossaudio.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_audio_ossaudio.c.patch similarity index 53% rename from x11-packages/qemu-system/qemu-2.12.0_audio_ossaudio.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_audio_ossaudio.c.patch index 331ef6765..348257efd 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_audio_ossaudio.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_audio_ossaudio.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/audio/ossaudio.c qemu-2.12.0.mod/audio/ossaudio.c ---- qemu-2.12.0/audio/ossaudio.c 2018-04-24 19:30:46.000000000 +0300 -+++ qemu-2.12.0.mod/audio/ossaudio.c 2018-06-25 14:11:33.200632120 +0300 +diff -uNr qemu-2.12.1/audio/ossaudio.c qemu-2.12.1.mod/audio/ossaudio.c +--- qemu-2.12.1/audio/ossaudio.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/audio/ossaudio.c 2018-09-17 16:27:46.947395515 +0300 @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" diff --git a/x11-packages/qemu-system/qemu-2.12.0_block.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_block.c.patch similarity index 60% rename from x11-packages/qemu-system/qemu-2.12.0_block.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_block.c.patch index 0d3e3d19d..09d82bf05 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_block.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_block.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/block.c qemu-2.12.0.mod/block.c ---- qemu-2.12.0/block.c 2018-04-24 19:30:46.000000000 +0300 -+++ qemu-2.12.0.mod/block.c 2018-06-25 14:11:33.210632119 +0300 +diff -uNr qemu-2.12.1/block.c qemu-2.12.1.mod/block.c +--- qemu-2.12.1/block.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/block.c 2018-09-17 16:27:46.960728928 +0300 @@ -544,7 +544,7 @@ const char *tmpdir; tmpdir = getenv("TMPDIR"); diff --git a/x11-packages/qemu-system/qemu-2.12.0_block_cloop.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_block_cloop.c.patch similarity index 66% rename from x11-packages/qemu-system/qemu-2.12.0_block_cloop.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_block_cloop.c.patch index 8729cb320..c1f9c13e4 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_block_cloop.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_block_cloop.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/block/cloop.c qemu-2.12.0.mod/block/cloop.c ---- qemu-2.12.0/block/cloop.c 2018-04-24 19:30:46.000000000 +0300 -+++ qemu-2.12.0.mod/block/cloop.c 2018-06-25 14:11:33.203965453 +0300 +diff -uNr qemu-2.12.1/block/cloop.c qemu-2.12.1.mod/block/cloop.c +--- qemu-2.12.1/block/cloop.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/block/cloop.c 2018-09-17 16:27:46.950728869 +0300 @@ -47,7 +47,7 @@ static int cloop_probe(const uint8_t *buf, int buf_size, const char *filename) diff --git a/x11-packages/qemu-system/qemu-2.12.0_configure.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_configure.patch similarity index 86% rename from x11-packages/qemu-system/qemu-2.12.0_configure.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_configure.patch index 257c52cd7..9ee2a29d6 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_configure.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_configure.patch @@ -1,7 +1,7 @@ -diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure ---- qemu-2.12.0/configure 2018-04-24 19:30:46.000000000 +0300 -+++ qemu-2.12.0.mod/configure 2018-06-25 14:46:22.550739693 +0300 -@@ -2079,23 +2079,10 @@ +diff -uNr qemu-2.12.1/configure qemu-2.12.1.mod/configure +--- qemu-2.12.1/configure 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/configure 2018-09-17 16:27:46.964062281 +0300 +@@ -2081,23 +2081,10 @@ LIBS="$LIBS -lz" ########################################## @@ -28,7 +28,7 @@ diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure ########################################## # snappy check -@@ -2117,22 +2104,9 @@ +@@ -2119,22 +2106,9 @@ fi ########################################## @@ -53,7 +53,7 @@ diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure ########################################## # libseccomp check -@@ -2974,6 +2948,7 @@ +@@ -2976,6 +2950,7 @@ # VNC SASL detection if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then cat > $TMPC < #include int main(void) { sasl_server_init(NULL, "qemu"); return 0; } -@@ -4035,16 +4010,6 @@ +@@ -4037,16 +4012,6 @@ ########################################## # signalfd probe signalfd="no" @@ -78,7 +78,7 @@ diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure # check if eventfd is supported eventfd=no -@@ -5490,7 +5455,7 @@ +@@ -5492,7 +5457,7 @@ # We can only support ivshmem if we have eventfd if [ "$eventfd" = "yes" ]; then diff --git a/x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-client_main.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-client_main.c.patch similarity index 59% rename from x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-client_main.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-client_main.c.patch index b7f0d9b07..b0f70f597 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-client_main.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-client_main.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/contrib/ivshmem-client/main.c qemu-2.12.0.mod/contrib/ivshmem-client/main.c ---- qemu-2.12.0/contrib/ivshmem-client/main.c 2018-04-24 19:30:46.000000000 +0300 -+++ qemu-2.12.0.mod/contrib/ivshmem-client/main.c 2018-06-25 14:12:24.330634752 +0300 +diff -uNr qemu-2.12.1/contrib/ivshmem-client/main.c qemu-2.12.1.mod/contrib/ivshmem-client/main.c +--- qemu-2.12.1/contrib/ivshmem-client/main.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/contrib/ivshmem-client/main.c 2018-09-17 16:27:46.974062341 +0300 @@ -12,7 +12,7 @@ #include "ivshmem-client.h" diff --git a/x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-server_main.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-server_main.c.patch similarity index 73% rename from x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-server_main.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-server_main.c.patch index e545ca277..e003bcda9 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-server_main.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-server_main.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/contrib/ivshmem-server/main.c qemu-2.12.0.mod/contrib/ivshmem-server/main.c ---- qemu-2.12.0/contrib/ivshmem-server/main.c 2018-04-24 19:30:46.000000000 +0300 -+++ qemu-2.12.0.mod/contrib/ivshmem-server/main.c 2018-06-25 14:12:36.683968721 +0300 +diff -uNr qemu-2.12.1/contrib/ivshmem-server/main.c qemu-2.12.1.mod/contrib/ivshmem-server/main.c +--- qemu-2.12.1/contrib/ivshmem-server/main.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/contrib/ivshmem-server/main.c 2018-09-17 16:27:46.974062341 +0300 @@ -14,8 +14,8 @@ #define IVSHMEM_SERVER_DEFAULT_VERBOSE 0 diff --git a/x11-packages/qemu-system/qemu-2.12.0_hw_usb_ccid-card-emulated.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_usb_ccid-card-emulated.c.patch similarity index 58% rename from x11-packages/qemu-system/qemu-2.12.0_hw_usb_ccid-card-emulated.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_usb_ccid-card-emulated.c.patch index a87a1293b..4f1d22a39 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_hw_usb_ccid-card-emulated.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_usb_ccid-card-emulated.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/hw/usb/ccid-card-emulated.c qemu-2.12.0.mod/hw/usb/ccid-card-emulated.c ---- qemu-2.12.0/hw/usb/ccid-card-emulated.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/hw/usb/ccid-card-emulated.c 2018-06-25 14:11:33.227298788 +0300 +diff -uNr qemu-2.12.1/hw/usb/ccid-card-emulated.c qemu-2.12.1.mod/hw/usb/ccid-card-emulated.c +--- qemu-2.12.1/hw/usb/ccid-card-emulated.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/hw/usb/ccid-card-emulated.c 2018-09-17 16:27:46.977395694 +0300 @@ -412,7 +412,7 @@ return 0; } diff --git a/x11-packages/qemu-system/qemu-2.12.0_hw_xenpv_xen_domainbuild.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_xenpv_xen_domainbuild.c.patch similarity index 59% rename from x11-packages/qemu-system/qemu-2.12.0_hw_xenpv_xen_domainbuild.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_xenpv_xen_domainbuild.c.patch index 4de3bd19d..b66971fb9 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_hw_xenpv_xen_domainbuild.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_xenpv_xen_domainbuild.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/hw/xenpv/xen_domainbuild.c qemu-2.12.0.mod/hw/xenpv/xen_domainbuild.c ---- qemu-2.12.0/hw/xenpv/xen_domainbuild.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/hw/xenpv/xen_domainbuild.c 2018-06-25 14:11:33.227298788 +0300 +diff -uNr qemu-2.12.1/hw/xenpv/xen_domainbuild.c qemu-2.12.1.mod/hw/xenpv/xen_domainbuild.c +--- qemu-2.12.1/hw/xenpv/xen_domainbuild.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/hw/xenpv/xen_domainbuild.c 2018-09-17 16:27:46.977395694 +0300 @@ -166,7 +166,7 @@ /* close all file handles, except stdio/out/err, diff --git a/x11-packages/qemu-system/qemu-2.12.0_include_net_net.h.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_include_net_net.h.patch similarity index 71% rename from x11-packages/qemu-system/qemu-2.12.0_include_net_net.h.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_include_net_net.h.patch index 11151fb40..ac0a6317d 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_include_net_net.h.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_include_net_net.h.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/include/net/net.h qemu-2.12.0.mod/include/net/net.h ---- qemu-2.12.0/include/net/net.h 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/include/net/net.h 2018-06-25 14:11:33.230632120 +0300 +diff -uNr qemu-2.12.1/include/net/net.h qemu-2.12.1.mod/include/net/net.h +--- qemu-2.12.1/include/net/net.h 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/include/net/net.h 2018-09-17 16:27:46.984062401 +0300 @@ -217,8 +217,8 @@ int net_hub_id_for_client(NetClientState *nc, int *id); NetClientState *net_hub_port_find(int hub_id); diff --git a/x11-packages/qemu-system/qemu-2.12.0_linux-user_signal.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_signal.c.patch similarity index 87% rename from x11-packages/qemu-system/qemu-2.12.0_linux-user_signal.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_signal.c.patch index d8c371650..6d8e77b7b 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_linux-user_signal.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_signal.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/linux-user/signal.c qemu-2.12.0.mod/linux-user/signal.c ---- qemu-2.12.0/linux-user/signal.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/linux-user/signal.c 2018-06-25 14:11:33.233965454 +0300 +diff -uNr qemu-2.12.1/linux-user/signal.c qemu-2.12.1.mod/linux-user/signal.c +--- qemu-2.12.1/linux-user/signal.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/linux-user/signal.c 2018-09-17 16:27:46.990729107 +0300 @@ -206,6 +206,26 @@ return atomic_xchg(&ts->signal_pending, 1); } diff --git a/x11-packages/qemu-system/qemu-2.12.0_linux-user_strace.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_strace.c.patch similarity index 52% rename from x11-packages/qemu-system/qemu-2.12.0_linux-user_strace.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_strace.c.patch index 29048e769..24af74a10 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_linux-user_strace.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_strace.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/linux-user/strace.c qemu-2.12.0.mod/linux-user/strace.c ---- qemu-2.12.0/linux-user/strace.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/linux-user/strace.c 2018-06-25 14:11:33.243965455 +0300 +diff -uNr qemu-2.12.1/linux-user/strace.c qemu-2.12.1.mod/linux-user/strace.c +--- qemu-2.12.1/linux-user/strace.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/linux-user/strace.c 2018-09-17 16:27:46.994062461 +0300 @@ -1,7 +1,7 @@ #include "qemu/osdep.h" #include diff --git a/x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall.c.patch similarity index 96% rename from x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall.c.patch index b2bdd5679..3e79826a8 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/linux-user/syscall.c qemu-2.12.0.mod/linux-user/syscall.c ---- qemu-2.12.0/linux-user/syscall.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/linux-user/syscall.c 2018-06-25 14:11:33.250632122 +0300 +diff -uNr qemu-2.12.1/linux-user/syscall.c qemu-2.12.1.mod/linux-user/syscall.c +--- qemu-2.12.1/linux-user/syscall.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/linux-user/syscall.c 2018-09-17 16:27:46.997395814 +0300 @@ -42,7 +42,7 @@ #include #include diff --git a/x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall_defs.h.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall_defs.h.patch similarity index 82% rename from x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall_defs.h.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall_defs.h.patch index 0d1894f85..4f231259d 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall_defs.h.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall_defs.h.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/linux-user/syscall_defs.h qemu-2.12.0.mod/linux-user/syscall_defs.h ---- qemu-2.12.0/linux-user/syscall_defs.h 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/linux-user/syscall_defs.h 2018-06-25 14:11:33.257298788 +0300 +diff -uNr qemu-2.12.1/linux-user/syscall_defs.h qemu-2.12.1.mod/linux-user/syscall_defs.h +--- qemu-2.12.1/linux-user/syscall_defs.h 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/linux-user/syscall_defs.h 2018-09-17 16:27:47.007395873 +0300 @@ -1967,7 +1967,7 @@ abi_ulong target_st_mtime_nsec; abi_ulong target_st_ctime; diff --git a/x11-packages/qemu-system/qemu-2.12.0_lockf_implementation.h.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_lockf_implementation.h.patch similarity index 86% rename from x11-packages/qemu-system/qemu-2.12.0_lockf_implementation.h.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_lockf_implementation.h.patch index 9fc9c114b..19aa188ed 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_lockf_implementation.h.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_lockf_implementation.h.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/lockf_implementation.h qemu-2.12.0.mod/lockf_implementation.h ---- qemu-2.12.0/lockf_implementation.h 1970-01-01 03:00:00.000000000 +0300 -+++ qemu-2.12.0.mod/lockf_implementation.h 2018-06-25 14:11:33.263965456 +0300 +diff -uNr qemu-2.12.1/lockf_implementation.h qemu-2.12.1.mod/lockf_implementation.h +--- qemu-2.12.1/lockf_implementation.h 1970-01-01 03:00:00.000000000 +0300 ++++ qemu-2.12.1.mod/lockf_implementation.h 2018-09-17 16:27:47.010729227 +0300 @@ -0,0 +1,56 @@ +#ifndef LOCKF_IMPLEMENTATION_H +#define LOCKF_IMPLEMENTATION_H diff --git a/x11-packages/qemu-system/qemu-2.12.0_migration_exec.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_migration_exec.c.patch similarity index 78% rename from x11-packages/qemu-system/qemu-2.12.0_migration_exec.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_migration_exec.c.patch index 8a7e5e3a9..db7689615 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_migration_exec.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_migration_exec.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/migration/exec.c qemu-2.12.0.mod/migration/exec.c ---- qemu-2.12.0/migration/exec.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/migration/exec.c 2018-06-25 14:11:33.263965456 +0300 +diff -uNr qemu-2.12.1/migration/exec.c qemu-2.12.1.mod/migration/exec.c +--- qemu-2.12.1/migration/exec.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/migration/exec.c 2018-09-17 16:27:47.010729227 +0300 @@ -27,7 +27,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) { diff --git a/x11-packages/qemu-system/qemu-2.12.0_net_tap.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_net_tap.c.patch similarity index 54% rename from x11-packages/qemu-system/qemu-2.12.0_net_tap.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_net_tap.c.patch index 4de447514..a39d37801 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_net_tap.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_net_tap.c.patch @@ -1,7 +1,7 @@ -diff -uNr qemu-2.12.0/net/tap.c qemu-2.12.0.mod/net/tap.c ---- qemu-2.12.0/net/tap.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/net/tap.c 2018-06-25 14:11:33.263965456 +0300 -@@ -525,7 +525,7 @@ +diff -uNr qemu-2.12.1/net/tap.c qemu-2.12.1.mod/net/tap.c +--- qemu-2.12.1/net/tap.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/net/tap.c 2018-09-17 16:27:47.014062580 +0300 +@@ -526,7 +526,7 @@ *parg++ = helper_cmd; *parg++ = NULL; diff --git a/x11-packages/qemu-system-x86_64/qemu-2.12.1_os-posix.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_os-posix.c.patch new file mode 100644 index 000000000..ec8b8ad38 --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_os-posix.c.patch @@ -0,0 +1,11 @@ +diff -uNr qemu-2.12.1/os-posix.c qemu-2.12.1.mod/os-posix.c +--- qemu-2.12.1/os-posix.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/os-posix.c 2018-09-17 16:27:47.014062580 +0300 +@@ -36,6 +36,7 @@ + #include "qemu/error-report.h" + #include "qemu/log.h" + #include "qemu/cutils.h" ++#include "lockf_implementation.h" + + #ifdef CONFIG_LINUX + #include diff --git a/x11-packages/qemu-system/qemu-2.12.0_qemu-nbd.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_qemu-nbd.c.patch similarity index 64% rename from x11-packages/qemu-system/qemu-2.12.0_qemu-nbd.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_qemu-nbd.c.patch index d2da15837..f3793b872 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_qemu-nbd.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_qemu-nbd.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/qemu-nbd.c qemu-2.12.0.mod/qemu-nbd.c ---- qemu-2.12.0/qemu-nbd.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/qemu-nbd.c 2018-06-25 14:13:19.787304273 +0300 +diff -uNr qemu-2.12.1/qemu-nbd.c qemu-2.12.1.mod/qemu-nbd.c +--- qemu-2.12.1/qemu-nbd.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/qemu-nbd.c 2018-09-17 16:27:47.017395933 +0300 @@ -43,7 +43,7 @@ #include "trace/control.h" #include "qemu-version.h" diff --git a/x11-packages/qemu-system/qemu-2.12.0_qga_main.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_qga_main.c.patch similarity index 52% rename from x11-packages/qemu-system/qemu-2.12.0_qga_main.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_qga_main.c.patch index 2875603cd..93fb41f42 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_qga_main.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_qga_main.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/qga/main.c qemu-2.12.0.mod/qga/main.c ---- qemu-2.12.0/qga/main.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/qga/main.c 2018-06-25 14:11:33.267298789 +0300 +diff -uNr qemu-2.12.1/qga/main.c qemu-2.12.1.mod/qga/main.c +--- qemu-2.12.1/qga/main.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/qga/main.c 2018-09-17 16:27:47.017395933 +0300 @@ -45,6 +45,8 @@ #endif #endif diff --git a/x11-packages/qemu-system-x86_64/qemu-2.12.1_scsi_qemu-pr-helper.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_scsi_qemu-pr-helper.c.patch new file mode 100644 index 000000000..cca653baa --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_scsi_qemu-pr-helper.c.patch @@ -0,0 +1,12 @@ +diff -uNr qemu-2.12.1/scsi/qemu-pr-helper.c qemu-2.12.1.mod/scsi/qemu-pr-helper.c +--- qemu-2.12.1/scsi/qemu-pr-helper.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/scsi/qemu-pr-helper.c 2018-09-17 16:27:47.020729287 +0300 +@@ -24,6 +24,8 @@ + #include + #include + ++#include "lockf_implementation.h" ++ + #ifdef CONFIG_LIBCAP + #include + #endif diff --git a/x11-packages/qemu-system/qemu-2.12.0_slirp_misc.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_misc.c.patch similarity index 50% rename from x11-packages/qemu-system/qemu-2.12.0_slirp_misc.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_misc.c.patch index eeaf4f404..063f5571c 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_slirp_misc.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_misc.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/slirp/misc.c qemu-2.12.0.mod/slirp/misc.c ---- qemu-2.12.0/slirp/misc.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/slirp/misc.c 2018-06-25 14:11:33.273965457 +0300 +diff -uNr qemu-2.12.1/slirp/misc.c qemu-2.12.1.mod/slirp/misc.c +--- qemu-2.12.1/slirp/misc.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/slirp/misc.c 2018-09-17 16:27:47.020729287 +0300 @@ -146,7 +146,7 @@ dup2(s, 0); dup2(s, 1); diff --git a/x11-packages/qemu-system/qemu-2.12.0_slirp_slirp.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_slirp.c.patch similarity index 72% rename from x11-packages/qemu-system/qemu-2.12.0_slirp_slirp.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_slirp.c.patch index ac85f67f7..9784564ae 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_slirp_slirp.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_slirp.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/slirp/slirp.c qemu-2.12.0.mod/slirp/slirp.c ---- qemu-2.12.0/slirp/slirp.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/slirp/slirp.c 2018-06-25 14:11:33.277298790 +0300 +diff -uNr qemu-2.12.1/slirp/slirp.c qemu-2.12.1.mod/slirp/slirp.c +--- qemu-2.12.1/slirp/slirp.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/slirp/slirp.c 2018-09-17 16:27:47.024062640 +0300 @@ -133,7 +133,7 @@ return 0; } diff --git a/x11-packages/qemu-system/qemu-2.12.0_tcg_i386_tcg-target.inc.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_i386_tcg-target.inc.c.patch similarity index 67% rename from x11-packages/qemu-system/qemu-2.12.0_tcg_i386_tcg-target.inc.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_i386_tcg-target.inc.c.patch index 7e354b81a..2261e2c5b 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_tcg_i386_tcg-target.inc.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_i386_tcg-target.inc.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/tcg/i386/tcg-target.inc.c qemu-2.12.0.mod/tcg/i386/tcg-target.inc.c ---- qemu-2.12.0/tcg/i386/tcg-target.inc.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/tcg/i386/tcg-target.inc.c 2018-06-25 16:18:25.654357396 +0300 +diff -uNr qemu-2.12.1/tcg/i386/tcg-target.inc.c qemu-2.12.1.mod/tcg/i386/tcg-target.inc.c +--- qemu-2.12.1/tcg/i386/tcg-target.inc.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/tcg/i386/tcg-target.inc.c 2018-09-17 16:27:47.027395993 +0300 @@ -1869,8 +1869,12 @@ #elif defined(__x86_64__) && defined(__linux__) # include diff --git a/x11-packages/qemu-system/qemu-2.12.0_tcg_tcg.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_tcg.c.patch similarity index 67% rename from x11-packages/qemu-system/qemu-2.12.0_tcg_tcg.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_tcg.c.patch index e9692e413..ddaa6e06f 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_tcg_tcg.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_tcg.c.patch @@ -1,7 +1,7 @@ -diff -uNr qemu-2.12.0/tcg/tcg.c qemu-2.12.0.mod/tcg/tcg.c ---- qemu-2.12.0/tcg/tcg.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/tcg/tcg.c 2018-06-25 14:11:33.287298790 +0300 -@@ -3717,7 +3717,7 @@ +diff -uNr qemu-2.12.1/tcg/tcg.c qemu-2.12.1.mod/tcg/tcg.c +--- qemu-2.12.1/tcg/tcg.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/tcg/tcg.c 2018-09-17 16:27:47.027395993 +0300 +@@ -3731,7 +3731,7 @@ /* Enable this block to be able to debug the ELF image file creation. One can use readelf, objdump, or other inspection utilities. */ { diff --git a/x11-packages/qemu-system/qemu-2.12.0_util_qemu-sockets.c.patch b/x11-packages/qemu-system-x86_64/qemu-2.12.1_util_qemu-sockets.c.patch similarity index 61% rename from x11-packages/qemu-system/qemu-2.12.0_util_qemu-sockets.c.patch rename to x11-packages/qemu-system-x86_64/qemu-2.12.1_util_qemu-sockets.c.patch index 16e20cbf3..df595039a 100644 --- a/x11-packages/qemu-system/qemu-2.12.0_util_qemu-sockets.c.patch +++ b/x11-packages/qemu-system-x86_64/qemu-2.12.1_util_qemu-sockets.c.patch @@ -1,6 +1,6 @@ -diff -uNr qemu-2.12.0/util/qemu-sockets.c qemu-2.12.0.mod/util/qemu-sockets.c ---- qemu-2.12.0/util/qemu-sockets.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/util/qemu-sockets.c 2018-06-25 14:11:33.290632124 +0300 +diff -uNr qemu-2.12.1/util/qemu-sockets.c qemu-2.12.1.mod/util/qemu-sockets.c +--- qemu-2.12.1/util/qemu-sockets.c 2018-08-03 00:48:53.000000000 +0300 ++++ qemu-2.12.1.mod/util/qemu-sockets.c 2018-09-17 16:27:47.030729346 +0300 @@ -841,7 +841,7 @@ path = saddr->path; } else { diff --git a/x11-packages/qemu-system-x86_64/qemu-common.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-common.subpackage.sh new file mode 100644 index 000000000..f5019c6fe --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-common.subpackage.sh @@ -0,0 +1,11 @@ +TERMUX_SUBPKG_INCLUDE=" +bin/qemu-pr-helper +libexec/qemu-bridge-helper +share/qemu +share/man/man1/qemu.1 +share/man/man7/qemu-qmp-ref.7 +share/man/man7/qemu-block-drivers.7 +" + +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libc++, libgnutls, libnettle, libutil" +TERMUX_SUBPKG_DESCRIPTION="A set common files for the QEMU system emulators" diff --git a/x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh new file mode 100644 index 000000000..ef12a0dbf --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh @@ -0,0 +1,7 @@ +TERMUX_SUBPKG_INCLUDE=" +bin/qemu-system-aarch64 +share/man/man1/qemu-system-aarch64.1 +" + +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" +TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator (aarch64)" diff --git a/x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh new file mode 100644 index 000000000..dc4b47e77 --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh @@ -0,0 +1,7 @@ +TERMUX_SUBPKG_INCLUDE=" +bin/qemu-system-arm +share/man/man1/qemu-system-arm.1 +" + +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" +TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator (arm)" diff --git a/x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh new file mode 100644 index 000000000..d481c64d6 --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh @@ -0,0 +1,7 @@ +TERMUX_SUBPKG_INCLUDE=" +bin/qemu-system-i386 +share/man/man1/qemu-system-i386.1 +" + +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libjpeg-turbo, liblzo, libnettle, libpixman, libpng, libsasl, libsdl2, libssh2, libutil, ncurses, qemu-common" +TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (i386)" diff --git a/x11-packages/qemu-system-x86_64/qemu-user-aarch64.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-user-aarch64.subpackage.sh new file mode 100644 index 000000000..0f554732f --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-user-aarch64.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="bin/qemu-aarch64" +TERMUX_SUBPKG_DEPENDS="libandroid-shmem, libandroid-support, glib, libc++" +TERMUX_SUBPKG_DESCRIPTION="CPU usermode emulation (aarch64)" diff --git a/x11-packages/qemu-system-x86_64/qemu-user-arm.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-user-arm.subpackage.sh new file mode 100644 index 000000000..e43c1fefb --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-user-arm.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="bin/qemu-arm" +TERMUX_SUBPKG_DEPENDS="libandroid-shmem, libandroid-support, glib, libc++" +TERMUX_SUBPKG_DESCRIPTION="CPU usermode emulation (arm)" diff --git a/x11-packages/qemu-system-x86_64/qemu-user-i386.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-user-i386.subpackage.sh new file mode 100644 index 000000000..05b8a679a --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-user-i386.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="bin/qemu-i386" +TERMUX_SUBPKG_DEPENDS="libandroid-shmem, libandroid-support, glib, libc++" +TERMUX_SUBPKG_DESCRIPTION="CPU usermode emulation (i386)" diff --git a/x11-packages/qemu-system-x86_64/qemu-user-x86_64.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-user-x86_64.subpackage.sh new file mode 100644 index 000000000..32d7972e7 --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-user-x86_64.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="bin/qemu-x86_64" +TERMUX_SUBPKG_DEPENDS="libandroid-shmem, libandroid-support, glib, libc++" +TERMUX_SUBPKG_DESCRIPTION="CPU usermode emulation (x86_64)" diff --git a/x11-packages/qemu-system-x86_64/qemu-utils.subpackage.sh b/x11-packages/qemu-system-x86_64/qemu-utils.subpackage.sh new file mode 100644 index 000000000..e8c129187 --- /dev/null +++ b/x11-packages/qemu-system-x86_64/qemu-utils.subpackage.sh @@ -0,0 +1,9 @@ +TERMUX_SUBPKG_INCLUDE=" +bin/qemu-img +bin/qemu-io +bin/qemu-keymap +share/man/man1/qemu-img.1 +" + +TERMUX_SUBPKG_DEPENDS="glib, libandroid-shmem, libandroid-support, libbz2, libc++, libcurl, libgnutls, libnettle, libssh2, libutil, libxkbcommon" +TERMUX_SUBPKG_DESCRIPTION="A set of utilities for the QEMU emulators" diff --git a/x11-packages/qemu-system/qemu-2.12.0_os-posix.c.patch b/x11-packages/qemu-system/qemu-2.12.0_os-posix.c.patch deleted file mode 100644 index ec68f6401..000000000 --- a/x11-packages/qemu-system/qemu-2.12.0_os-posix.c.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr qemu-2.12.0/os-posix.c qemu-2.12.0.mod/os-posix.c ---- qemu-2.12.0/os-posix.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/os-posix.c 2018-06-25 14:11:33.267298789 +0300 -@@ -36,6 +36,7 @@ - #include "qemu/error-report.h" - #include "qemu/log.h" - #include "qemu/cutils.h" -+#include "lockf_implementation.h" - - #ifdef CONFIG_LINUX - #include diff --git a/x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins.c.patch b/x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins.c.patch deleted file mode 100644 index c3dd2487a..000000000 --- a/x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr qemu-2.12.0/roms/openbios/arch/unix/plugins.c qemu-2.12.0.mod/roms/openbios/arch/unix/plugins.c ---- qemu-2.12.0/roms/openbios/arch/unix/plugins.c 2018-04-24 19:33:10.000000000 +0300 -+++ qemu-2.12.0.mod/roms/openbios/arch/unix/plugins.c 2018-06-25 14:11:33.270632123 +0300 -@@ -14,7 +14,7 @@ - - #include "unix/plugins.h" - --unsigned char *plugindir = "/usr/share/OpenBIOS/plugins"; -+unsigned char *plugindir = "@TERMUX_PREFIX@/share/OpenBIOS/plugins"; - #define PLUGINDIR plugindir - #define PATHSIZE 256 - diff --git a/x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins_loader.c.patch b/x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins_loader.c.patch deleted file mode 100644 index e4e6557f8..000000000 --- a/x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins_loader.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr qemu-2.12.0/roms/openbios/arch/unix/plugins/loader.c qemu-2.12.0.mod/roms/openbios/arch/unix/plugins/loader.c ---- qemu-2.12.0/roms/openbios/arch/unix/plugins/loader.c 2018-04-24 19:33:10.000000000 +0300 -+++ qemu-2.12.0.mod/roms/openbios/arch/unix/plugins/loader.c 2018-06-25 14:11:33.270632123 +0300 -@@ -19,7 +19,7 @@ - - #include "unix/plugins.h" - --#define PLUGINDIR "/usr/share/OpenBIOS/plugins" -+#define PLUGINDIR "@TERMUX_PREFIX@/share/OpenBIOS/plugins" - #define PATHSIZE 256 - - #define DEBUG_PLUGINS diff --git a/x11-packages/qemu-system/qemu-2.12.0_roms_seabios_scripts_kconfig_lkc.h.patch b/x11-packages/qemu-system/qemu-2.12.0_roms_seabios_scripts_kconfig_lkc.h.patch deleted file mode 100644 index eea26da2e..000000000 --- a/x11-packages/qemu-system/qemu-2.12.0_roms_seabios_scripts_kconfig_lkc.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr qemu-2.12.0/roms/seabios/scripts/kconfig/lkc.h qemu-2.12.0.mod/roms/seabios/scripts/kconfig/lkc.h ---- qemu-2.12.0/roms/seabios/scripts/kconfig/lkc.h 2018-04-24 19:33:10.000000000 +0300 -+++ qemu-2.12.0.mod/roms/seabios/scripts/kconfig/lkc.h 2018-06-25 14:11:33.270632123 +0300 -@@ -31,7 +31,7 @@ - #define PACKAGE "linux" - #endif - --#define LOCALEDIR "/usr/share/locale" -+#define LOCALEDIR "@TERMUX_PREFIX@/share/locale" - - #define _(text) gettext(text) - #define N_(text) (text) diff --git a/x11-packages/qemu-system/qemu-2.12.0_roms_skiboot_external_opal-prd_test_test_pnor_ops.c.patch b/x11-packages/qemu-system/qemu-2.12.0_roms_skiboot_external_opal-prd_test_test_pnor_ops.c.patch deleted file mode 100644 index caf52194a..000000000 --- a/x11-packages/qemu-system/qemu-2.12.0_roms_skiboot_external_opal-prd_test_test_pnor_ops.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr qemu-2.12.0/roms/skiboot/external/opal-prd/test/test_pnor_ops.c qemu-2.12.0.mod/roms/skiboot/external/opal-prd/test/test_pnor_ops.c ---- qemu-2.12.0/roms/skiboot/external/opal-prd/test/test_pnor_ops.c 2018-04-24 19:33:10.000000000 +0300 -+++ qemu-2.12.0.mod/roms/skiboot/external/opal-prd/test/test_pnor_ops.c 2018-06-25 14:11:33.270632123 +0300 -@@ -115,7 +115,7 @@ - uint8_t data[24]; - char filename[24]; - -- strcpy(filename, "/tmp/pnor-XXXXXX"); -+ strcpy(filename, "@TERMUX_PREFIX@/tmp/pnor-XXXXXX"); - - fd = mkstemp(filename); - if (fd < 0) { diff --git a/x11-packages/qemu-system/qemu-2.12.0_scsi_qemu-pr-helper.c.patch b/x11-packages/qemu-system/qemu-2.12.0_scsi_qemu-pr-helper.c.patch deleted file mode 100644 index 7516332ec..000000000 --- a/x11-packages/qemu-system/qemu-2.12.0_scsi_qemu-pr-helper.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr qemu-2.12.0/scsi/qemu-pr-helper.c qemu-2.12.0.mod/scsi/qemu-pr-helper.c ---- qemu-2.12.0/scsi/qemu-pr-helper.c 2018-04-24 19:30:47.000000000 +0300 -+++ qemu-2.12.0.mod/scsi/qemu-pr-helper.c 2018-06-25 14:11:33.273965457 +0300 -@@ -24,6 +24,8 @@ - #include - #include - -+#include "lockf_implementation.h" -+ - #ifdef CONFIG_LIBCAP - #include - #endif diff --git a/x11-packages/qemu-system/qemu-system-aarch64.subpackage.sh b/x11-packages/qemu-system/qemu-system-aarch64.subpackage.sh deleted file mode 100644 index 4afdc9490..000000000 --- a/x11-packages/qemu-system/qemu-system-aarch64.subpackage.sh +++ /dev/null @@ -1,7 +0,0 @@ -TERMUX_SUBPKG_INCLUDE=" -bin/qemu-system-aarch64 -share/man/man1/qemu-system-aarch64.1 -" - -TERMUX_SUBPKG_DEPENDS="qemu-system" -TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (AArch64 target)" diff --git a/x11-packages/qemu-system/qemu-system-arm.subpackage.sh b/x11-packages/qemu-system/qemu-system-arm.subpackage.sh deleted file mode 100644 index 50dcdacf5..000000000 --- a/x11-packages/qemu-system/qemu-system-arm.subpackage.sh +++ /dev/null @@ -1,7 +0,0 @@ -TERMUX_SUBPKG_INCLUDE=" -bin/qemu-system-arm -share/man/man1/qemu-system-arm.1 -" - -TERMUX_SUBPKG_DEPENDS="qemu-system" -TERMUX_SUBPKG_DESCRIPTION="A generic and open source machine emulator and virtualizer (ARM target)"