sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qemu-system: properly split QEMU stuff between packages

Browse Source 
This includes package renaming: qemu-system --> qemu-system-x86_64
This commit is contained in:
Leonid Pliushch 2018-09-17 21:35:10 +03:00 committed by Yaksh Bariya
parent c92ba65fd5
commit f655924d36
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
43 changed files with 157 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11-packages/qemu-system/build.sh → x11-packages/qemu-system-x86_64/build.sh
View File

@ -1,11 +1,11 @@
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr" TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com> @xeffyr"
TERMUX_PKG_HOMEPAGE=https://www.qemu.org 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_VERSION=2.12.1
TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=33583800e0006cd00b78226b85be5a27c8e3b156bed2e60e83ecbeb7b9b8364f 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_BUILD_IN_SRC=true
TERMUX_PKG_RM_AFTER_INSTALL=" TERMUX_PKG_RM_AFTER_INSTALL="
@ -14,6 +14,8 @@ share/man/man8
" "
termux_step_configure() { 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}" \ ./configure --prefix="${TERMUX_PREFIX}" \
--cross-prefix="${CC//clang}" \ --cross-prefix="${CC//clang}" \
--cc="${CC}" \ --cc="${CC}" \
@ -50,7 +52,7 @@ termux_step_configure() {
--enable-libssh2 \ --enable-libssh2 \
--disable-jemalloc \ --disable-jemalloc \
--disable-libxml2 \ --disable-libxml2 \
--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,x86_64-softmmu --target-list="${ENABLED_TARGETS}"
} }
termux_step_post_make_install() { termux_step_post_make_install() {

6
x11-packages/qemu-system/qemu-2.12.0_audio_ossaudio.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_audio_ossaudio.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/audio/ossaudio.c qemu-2.12.0.mod/audio/ossaudio.c diff -uNr qemu-2.12.1/audio/ossaudio.c qemu-2.12.1.mod/audio/ossaudio.c
--- qemu-2.12.0/audio/ossaudio.c 2018-04-24 19:30:46.000000000 +0300 --- qemu-2.12.1/audio/ossaudio.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/audio/ossaudio.c 2018-06-25 14:11:33.200632120 +0300 +++ qemu-2.12.1.mod/audio/ossaudio.c 2018-09-17 16:27:46.947395515 +0300
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"

6
x11-packages/qemu-system/qemu-2.12.0_block.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_block.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/block.c qemu-2.12.0.mod/block.c diff -uNr qemu-2.12.1/block.c qemu-2.12.1.mod/block.c
--- qemu-2.12.0/block.c 2018-04-24 19:30:46.000000000 +0300 --- qemu-2.12.1/block.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/block.c 2018-06-25 14:11:33.210632119 +0300 +++ qemu-2.12.1.mod/block.c 2018-09-17 16:27:46.960728928 +0300
@@ -544,7 +544,7 @@ @@ -544,7 +544,7 @@
const char *tmpdir; const char *tmpdir;
tmpdir = getenv("TMPDIR"); tmpdir = getenv("TMPDIR");

6
x11-packages/qemu-system/qemu-2.12.0_block_cloop.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_block_cloop.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/block/cloop.c qemu-2.12.0.mod/block/cloop.c diff -uNr qemu-2.12.1/block/cloop.c qemu-2.12.1.mod/block/cloop.c
--- qemu-2.12.0/block/cloop.c 2018-04-24 19:30:46.000000000 +0300 --- qemu-2.12.1/block/cloop.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/block/cloop.c 2018-06-25 14:11:33.203965453 +0300 +++ qemu-2.12.1.mod/block/cloop.c 2018-09-17 16:27:46.950728869 +0300
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
static int cloop_probe(const uint8_t *buf, int buf_size, const char *filename) static int cloop_probe(const uint8_t *buf, int buf_size, const char *filename)

16
x11-packages/qemu-system/qemu-2.12.0_configure.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_configure.patch
View File

@ -1,7 +1,7 @@
diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure diff -uNr qemu-2.12.1/configure qemu-2.12.1.mod/configure
--- qemu-2.12.0/configure 2018-04-24 19:30:46.000000000 +0300 --- qemu-2.12.1/configure 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/configure 2018-06-25 14:46:22.550739693 +0300 +++ qemu-2.12.1.mod/configure 2018-09-17 16:27:46.964062281 +0300
@@ -2079,23 +2079,10 @@ @@ -2081,23 +2081,10 @@
LIBS="$LIBS -lz" LIBS="$LIBS -lz"
########################################## ##########################################
@ -28,7 +28,7 @@ diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure
########################################## ##########################################
# snappy check # snappy check
@@ -2117,22 +2104,9 @@ @@ -2119,22 +2106,9 @@
fi fi
########################################## ##########################################
@ -53,7 +53,7 @@ diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure
########################################## ##########################################
# libseccomp check # libseccomp check
@@ -2974,6 +2948,7 @@ @@ -2976,6 +2950,7 @@
# VNC SASL detection # VNC SASL detection
if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then
cat > $TMPC <<EOF cat > $TMPC <<EOF
@ -61,7 +61,7 @@ diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure
#include <sasl/sasl.h> #include <sasl/sasl.h>
#include <stdio.h> #include <stdio.h>
int main(void) { sasl_server_init(NULL, "qemu"); return 0; } int main(void) { sasl_server_init(NULL, "qemu"); return 0; }
@@ -4035,16 +4010,6 @@ @@ -4037,16 +4012,6 @@
########################################## ##########################################
# signalfd probe # signalfd probe
signalfd="no" signalfd="no"
@ -78,7 +78,7 @@ diff -uNr qemu-2.12.0/configure qemu-2.12.0.mod/configure
# check if eventfd is supported # check if eventfd is supported
eventfd=no eventfd=no
@@ -5490,7 +5455,7 @@ @@ -5492,7 +5457,7 @@
# We can only support ivshmem if we have eventfd # We can only support ivshmem if we have eventfd
if [ "$eventfd" = "yes" ]; then if [ "$eventfd" = "yes" ]; then

6
x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-client_main.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-client_main.c.patch
View File

@ -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 diff -uNr qemu-2.12.1/contrib/ivshmem-client/main.c qemu-2.12.1.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.1/contrib/ivshmem-client/main.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/contrib/ivshmem-client/main.c 2018-06-25 14:12:24.330634752 +0300 +++ qemu-2.12.1.mod/contrib/ivshmem-client/main.c 2018-09-17 16:27:46.974062341 +0300
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
#include "ivshmem-client.h" #include "ivshmem-client.h"

6
x11-packages/qemu-system/qemu-2.12.0_contrib_ivshmem-server_main.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_contrib_ivshmem-server_main.c.patch
View File

@ -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 diff -uNr qemu-2.12.1/contrib/ivshmem-server/main.c qemu-2.12.1.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.1/contrib/ivshmem-server/main.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/contrib/ivshmem-server/main.c 2018-06-25 14:12:36.683968721 +0300 +++ qemu-2.12.1.mod/contrib/ivshmem-server/main.c 2018-09-17 16:27:46.974062341 +0300
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
#define IVSHMEM_SERVER_DEFAULT_VERBOSE 0 #define IVSHMEM_SERVER_DEFAULT_VERBOSE 0

6
x11-packages/qemu-system/qemu-2.12.0_hw_usb_ccid-card-emulated.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_usb_ccid-card-emulated.c.patch
View File

@ -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 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.0/hw/usb/ccid-card-emulated.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/hw/usb/ccid-card-emulated.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/hw/usb/ccid-card-emulated.c 2018-06-25 14:11:33.227298788 +0300 +++ qemu-2.12.1.mod/hw/usb/ccid-card-emulated.c 2018-09-17 16:27:46.977395694 +0300
@@ -412,7 +412,7 @@ @@ -412,7 +412,7 @@
return 0; return 0;
} }

6
x11-packages/qemu-system/qemu-2.12.0_hw_xenpv_xen_domainbuild.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_hw_xenpv_xen_domainbuild.c.patch
View File

@ -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 diff -uNr qemu-2.12.1/hw/xenpv/xen_domainbuild.c qemu-2.12.1.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.1/hw/xenpv/xen_domainbuild.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/hw/xenpv/xen_domainbuild.c 2018-06-25 14:11:33.227298788 +0300 +++ qemu-2.12.1.mod/hw/xenpv/xen_domainbuild.c 2018-09-17 16:27:46.977395694 +0300
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
/* close all file handles, except stdio/out/err, /* close all file handles, except stdio/out/err,

6
x11-packages/qemu-system/qemu-2.12.0_include_net_net.h.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_include_net_net.h.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/include/net/net.h qemu-2.12.0.mod/include/net/net.h diff -uNr qemu-2.12.1/include/net/net.h qemu-2.12.1.mod/include/net/net.h
--- qemu-2.12.0/include/net/net.h 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/include/net/net.h 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/include/net/net.h 2018-06-25 14:11:33.230632120 +0300 +++ qemu-2.12.1.mod/include/net/net.h 2018-09-17 16:27:46.984062401 +0300
@@ -217,8 +217,8 @@ @@ -217,8 +217,8 @@
int net_hub_id_for_client(NetClientState *nc, int *id); int net_hub_id_for_client(NetClientState *nc, int *id);
NetClientState *net_hub_port_find(int hub_id); NetClientState *net_hub_port_find(int hub_id);

6
x11-packages/qemu-system/qemu-2.12.0_linux-user_signal.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_signal.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/linux-user/signal.c qemu-2.12.0.mod/linux-user/signal.c diff -uNr qemu-2.12.1/linux-user/signal.c qemu-2.12.1.mod/linux-user/signal.c
--- qemu-2.12.0/linux-user/signal.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/linux-user/signal.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/linux-user/signal.c 2018-06-25 14:11:33.233965454 +0300 +++ qemu-2.12.1.mod/linux-user/signal.c 2018-09-17 16:27:46.990729107 +0300
@@ -206,6 +206,26 @@ @@ -206,6 +206,26 @@
return atomic_xchg(&ts->signal_pending, 1); return atomic_xchg(&ts->signal_pending, 1);
} }

6
x11-packages/qemu-system/qemu-2.12.0_linux-user_strace.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_strace.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/linux-user/strace.c qemu-2.12.0.mod/linux-user/strace.c diff -uNr qemu-2.12.1/linux-user/strace.c qemu-2.12.1.mod/linux-user/strace.c
--- qemu-2.12.0/linux-user/strace.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/linux-user/strace.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/linux-user/strace.c 2018-06-25 14:11:33.243965455 +0300 +++ qemu-2.12.1.mod/linux-user/strace.c 2018-09-17 16:27:46.994062461 +0300
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <sys/ipc.h> #include <sys/ipc.h>

6
x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/linux-user/syscall.c qemu-2.12.0.mod/linux-user/syscall.c diff -uNr qemu-2.12.1/linux-user/syscall.c qemu-2.12.1.mod/linux-user/syscall.c
--- qemu-2.12.0/linux-user/syscall.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/linux-user/syscall.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/linux-user/syscall.c 2018-06-25 14:11:33.250632122 +0300 +++ qemu-2.12.1.mod/linux-user/syscall.c 2018-09-17 16:27:46.997395814 +0300
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
#include <poll.h> #include <poll.h>
#include <sys/times.h> #include <sys/times.h>

6
x11-packages/qemu-system/qemu-2.12.0_linux-user_syscall_defs.h.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_linux-user_syscall_defs.h.patch
View File

@ -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 diff -uNr qemu-2.12.1/linux-user/syscall_defs.h qemu-2.12.1.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.1/linux-user/syscall_defs.h 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/linux-user/syscall_defs.h 2018-06-25 14:11:33.257298788 +0300 +++ qemu-2.12.1.mod/linux-user/syscall_defs.h 2018-09-17 16:27:47.007395873 +0300
@@ -1967,7 +1967,7 @@ @@ -1967,7 +1967,7 @@
abi_ulong target_st_mtime_nsec; abi_ulong target_st_mtime_nsec;
abi_ulong target_st_ctime; abi_ulong target_st_ctime;

6
x11-packages/qemu-system/qemu-2.12.0_lockf_implementation.h.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_lockf_implementation.h.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/lockf_implementation.h qemu-2.12.0.mod/lockf_implementation.h diff -uNr qemu-2.12.1/lockf_implementation.h qemu-2.12.1.mod/lockf_implementation.h
--- qemu-2.12.0/lockf_implementation.h 1970-01-01 03:00:00.000000000 +0300 --- qemu-2.12.1/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 +++ qemu-2.12.1.mod/lockf_implementation.h 2018-09-17 16:27:47.010729227 +0300
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+#ifndef LOCKF_IMPLEMENTATION_H +#ifndef LOCKF_IMPLEMENTATION_H
+#define LOCKF_IMPLEMENTATION_H +#define LOCKF_IMPLEMENTATION_H

6
x11-packages/qemu-system/qemu-2.12.0_migration_exec.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_migration_exec.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/migration/exec.c qemu-2.12.0.mod/migration/exec.c diff -uNr qemu-2.12.1/migration/exec.c qemu-2.12.1.mod/migration/exec.c
--- qemu-2.12.0/migration/exec.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/migration/exec.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/migration/exec.c 2018-06-25 14:11:33.263965456 +0300 +++ qemu-2.12.1.mod/migration/exec.c 2018-09-17 16:27:47.010729227 +0300
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp)
{ {

8
x11-packages/qemu-system/qemu-2.12.0_net_tap.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_net_tap.c.patch
View File

@ -1,7 +1,7 @@
diff -uNr qemu-2.12.0/net/tap.c qemu-2.12.0.mod/net/tap.c diff -uNr qemu-2.12.1/net/tap.c qemu-2.12.1.mod/net/tap.c
--- qemu-2.12.0/net/tap.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/net/tap.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/net/tap.c 2018-06-25 14:11:33.263965456 +0300 +++ qemu-2.12.1.mod/net/tap.c 2018-09-17 16:27:47.014062580 +0300
@@ -525,7 +525,7 @@ @@ -526,7 +526,7 @@
*parg++ = helper_cmd; *parg++ = helper_cmd;
*parg++ = NULL; *parg++ = NULL;

11
x11-packages/qemu-system-x86_64/qemu-2.12.1_os-posix.c.patch Normal file
View File

@ -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 <sys/prctl.h>

6
x11-packages/qemu-system/qemu-2.12.0_qemu-nbd.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_qemu-nbd.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/qemu-nbd.c qemu-2.12.0.mod/qemu-nbd.c diff -uNr qemu-2.12.1/qemu-nbd.c qemu-2.12.1.mod/qemu-nbd.c
--- qemu-2.12.0/qemu-nbd.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/qemu-nbd.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/qemu-nbd.c 2018-06-25 14:13:19.787304273 +0300 +++ qemu-2.12.1.mod/qemu-nbd.c 2018-09-17 16:27:47.017395933 +0300
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
#include "trace/control.h" #include "trace/control.h"
#include "qemu-version.h" #include "qemu-version.h"

6
x11-packages/qemu-system/qemu-2.12.0_qga_main.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_qga_main.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/qga/main.c qemu-2.12.0.mod/qga/main.c diff -uNr qemu-2.12.1/qga/main.c qemu-2.12.1.mod/qga/main.c
--- qemu-2.12.0/qga/main.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/qga/main.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/qga/main.c 2018-06-25 14:11:33.267298789 +0300 +++ qemu-2.12.1.mod/qga/main.c 2018-09-17 16:27:47.017395933 +0300
@@ -45,6 +45,8 @@ @@ -45,6 +45,8 @@
#endif #endif
#endif #endif

12
x11-packages/qemu-system-x86_64/qemu-2.12.1_scsi_qemu-pr-helper.c.patch Normal file
View File

@ -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 <linux/dm-ioctl.h>
#include <scsi/sg.h>
+#include "lockf_implementation.h"
+
#ifdef CONFIG_LIBCAP
#include <cap-ng.h>
#endif

6
x11-packages/qemu-system/qemu-2.12.0_slirp_misc.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_misc.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/slirp/misc.c qemu-2.12.0.mod/slirp/misc.c diff -uNr qemu-2.12.1/slirp/misc.c qemu-2.12.1.mod/slirp/misc.c
--- qemu-2.12.0/slirp/misc.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/slirp/misc.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/slirp/misc.c 2018-06-25 14:11:33.273965457 +0300 +++ qemu-2.12.1.mod/slirp/misc.c 2018-09-17 16:27:47.020729287 +0300
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
dup2(s, 0); dup2(s, 0);
dup2(s, 1); dup2(s, 1);

6
x11-packages/qemu-system/qemu-2.12.0_slirp_slirp.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_slirp_slirp.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/slirp/slirp.c qemu-2.12.0.mod/slirp/slirp.c diff -uNr qemu-2.12.1/slirp/slirp.c qemu-2.12.1.mod/slirp/slirp.c
--- qemu-2.12.0/slirp/slirp.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/slirp/slirp.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/slirp/slirp.c 2018-06-25 14:11:33.277298790 +0300 +++ qemu-2.12.1.mod/slirp/slirp.c 2018-09-17 16:27:47.024062640 +0300
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
return 0; return 0;
} }

6
x11-packages/qemu-system/qemu-2.12.0_tcg_i386_tcg-target.inc.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_i386_tcg-target.inc.c.patch
View File

@ -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 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.0/tcg/i386/tcg-target.inc.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/tcg/i386/tcg-target.inc.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/tcg/i386/tcg-target.inc.c 2018-06-25 16:18:25.654357396 +0300 +++ qemu-2.12.1.mod/tcg/i386/tcg-target.inc.c 2018-09-17 16:27:47.027395993 +0300
@@ -1869,8 +1869,12 @@ @@ -1869,8 +1869,12 @@
#elif defined(__x86_64__) && defined(__linux__) #elif defined(__x86_64__) && defined(__linux__)
# include <asm/prctl.h> # include <asm/prctl.h>

8
x11-packages/qemu-system/qemu-2.12.0_tcg_tcg.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_tcg_tcg.c.patch
View File

@ -1,7 +1,7 @@
diff -uNr qemu-2.12.0/tcg/tcg.c qemu-2.12.0.mod/tcg/tcg.c diff -uNr qemu-2.12.1/tcg/tcg.c qemu-2.12.1.mod/tcg/tcg.c
--- qemu-2.12.0/tcg/tcg.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/tcg/tcg.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/tcg/tcg.c 2018-06-25 14:11:33.287298790 +0300 +++ qemu-2.12.1.mod/tcg/tcg.c 2018-09-17 16:27:47.027395993 +0300
@@ -3717,7 +3717,7 @@ @@ -3731,7 +3731,7 @@
/* Enable this block to be able to debug the ELF image file creation. /* Enable this block to be able to debug the ELF image file creation.
One can use readelf, objdump, or other inspection utilities. */ One can use readelf, objdump, or other inspection utilities. */
{ {

6
x11-packages/qemu-system/qemu-2.12.0_util_qemu-sockets.c.patch → x11-packages/qemu-system-x86_64/qemu-2.12.1_util_qemu-sockets.c.patch
View File

@ -1,6 +1,6 @@
diff -uNr qemu-2.12.0/util/qemu-sockets.c qemu-2.12.0.mod/util/qemu-sockets.c diff -uNr qemu-2.12.1/util/qemu-sockets.c qemu-2.12.1.mod/util/qemu-sockets.c
--- qemu-2.12.0/util/qemu-sockets.c 2018-04-24 19:30:47.000000000 +0300 --- qemu-2.12.1/util/qemu-sockets.c 2018-08-03 00:48:53.000000000 +0300
+++ qemu-2.12.0.mod/util/qemu-sockets.c 2018-06-25 14:11:33.290632124 +0300 +++ qemu-2.12.1.mod/util/qemu-sockets.c 2018-09-17 16:27:47.030729346 +0300
@@ -841,7 +841,7 @@ @@ -841,7 +841,7 @@
path = saddr->path; path = saddr->path;
} else { } else {

11
x11-packages/qemu-system-x86_64/qemu-common.subpackage.sh Normal file
View File

@ -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"

7
x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh Normal file
View File

@ -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)"

7
x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh Normal file
View File

@ -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)"

7
x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh Normal file
View File

@ -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)"

3
x11-packages/qemu-system-x86_64/qemu-user-aarch64.subpackage.sh Normal file
View File

@ -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)"

3
x11-packages/qemu-system-x86_64/qemu-user-arm.subpackage.sh Normal file
View File

@ -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)"

3
x11-packages/qemu-system-x86_64/qemu-user-i386.subpackage.sh Normal file
View File

@ -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)"

3
x11-packages/qemu-system-x86_64/qemu-user-x86_64.subpackage.sh Normal file
View File

@ -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)"

9
x11-packages/qemu-system-x86_64/qemu-utils.subpackage.sh Normal file
View File

@ -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"

11
x11-packages/qemu-system/qemu-2.12.0_os-posix.c.patch
View File

@ -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 <sys/prctl.h>

12
x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins.c.patch
View File

@ -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

12
x11-packages/qemu-system/qemu-2.12.0_roms_openbios_arch_unix_plugins_loader.c.patch
View File

@ -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

12
x11-packages/qemu-system/qemu-2.12.0_roms_seabios_scripts_kconfig_lkc.h.patch
View File

@ -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)

12
x11-packages/qemu-system/qemu-2.12.0_roms_skiboot_external_opal-prd_test_test_pnor_ops.c.patch
View File

@ -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) {

12
x11-packages/qemu-system/qemu-2.12.0_scsi_qemu-pr-helper.c.patch
View File

@ -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 <linux/dm-ioctl.h>
#include <scsi/sg.h>
+#include "lockf_implementation.h"
+
#ifdef CONFIG_LIBCAP
#include <cap-ng.h>
#endif

7
x11-packages/qemu-system/qemu-system-aarch64.subpackage.sh
View File

@ -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)"

7
x11-packages/qemu-system/qemu-system-arm.subpackage.sh
View File

@ -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)"