From ea33d9e7349da09df19abf8b2f9f64dbd67d0f12 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Tue, 8 Dec 2020 12:47:57 +0000 Subject: [PATCH] rename package: qemu-system-x86_64 --> qemu-system-x86-64 DEB package should not have "_" (underscore) in name. --- .../0000-android-config-support.patch | 0 .../0001-fix-hardcoded-paths.patch | 0 .../0002-fix-soundcard.h-location.patch | 0 .../0003-add-missing-arch_prctl.patch | 0 .../0004-fix-time_nsec-defs.patch | 0 .../0005-add-missing-telldir-seekdir.patch | 0 .../0006-add-missing-sigorset.patch | 0 .../0007-fix-sem.h-location.patch | 0 .../0008-fix-syscalls.patch | 0 .../0009-fix-struct-member-conflicts.patch | 0 .../0010-fix-mman.h-defs.patch | 0 .../0011-disable-glob.h-include.patch | 0 .../0012-reserve-space-for-brk.patch | 0 .../{qemu-system-x86_64 => qemu-system-x86-64}/build.sh | 4 ++++ .../qemu-system-aarch64.subpackage.sh | 0 .../qemu-system-arm.subpackage.sh | 0 .../qemu-system-i386.subpackage.sh | 0 .../qemu-system-riscv32.subpackage.sh | 0 .../qemu-system-riscv64.subpackage.sh | 0 19 files changed, 4 insertions(+) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0000-android-config-support.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0001-fix-hardcoded-paths.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0002-fix-soundcard.h-location.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0003-add-missing-arch_prctl.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0004-fix-time_nsec-defs.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0005-add-missing-telldir-seekdir.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0006-add-missing-sigorset.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0007-fix-sem.h-location.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0008-fix-syscalls.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0009-fix-struct-member-conflicts.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0010-fix-mman.h-defs.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0011-disable-glob.h-include.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/0012-reserve-space-for-brk.patch (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/build.sh (95%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/qemu-system-aarch64.subpackage.sh (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/qemu-system-arm.subpackage.sh (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/qemu-system-i386.subpackage.sh (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/qemu-system-riscv32.subpackage.sh (100%) rename x11-packages/{qemu-system-x86_64 => qemu-system-x86-64}/qemu-system-riscv64.subpackage.sh (100%) diff --git a/x11-packages/qemu-system-x86_64/0000-android-config-support.patch b/x11-packages/qemu-system-x86-64/0000-android-config-support.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0000-android-config-support.patch rename to x11-packages/qemu-system-x86-64/0000-android-config-support.patch diff --git a/x11-packages/qemu-system-x86_64/0001-fix-hardcoded-paths.patch b/x11-packages/qemu-system-x86-64/0001-fix-hardcoded-paths.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0001-fix-hardcoded-paths.patch rename to x11-packages/qemu-system-x86-64/0001-fix-hardcoded-paths.patch diff --git a/x11-packages/qemu-system-x86_64/0002-fix-soundcard.h-location.patch b/x11-packages/qemu-system-x86-64/0002-fix-soundcard.h-location.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0002-fix-soundcard.h-location.patch rename to x11-packages/qemu-system-x86-64/0002-fix-soundcard.h-location.patch diff --git a/x11-packages/qemu-system-x86_64/0003-add-missing-arch_prctl.patch b/x11-packages/qemu-system-x86-64/0003-add-missing-arch_prctl.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0003-add-missing-arch_prctl.patch rename to x11-packages/qemu-system-x86-64/0003-add-missing-arch_prctl.patch diff --git a/x11-packages/qemu-system-x86_64/0004-fix-time_nsec-defs.patch b/x11-packages/qemu-system-x86-64/0004-fix-time_nsec-defs.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0004-fix-time_nsec-defs.patch rename to x11-packages/qemu-system-x86-64/0004-fix-time_nsec-defs.patch diff --git a/x11-packages/qemu-system-x86_64/0005-add-missing-telldir-seekdir.patch b/x11-packages/qemu-system-x86-64/0005-add-missing-telldir-seekdir.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0005-add-missing-telldir-seekdir.patch rename to x11-packages/qemu-system-x86-64/0005-add-missing-telldir-seekdir.patch diff --git a/x11-packages/qemu-system-x86_64/0006-add-missing-sigorset.patch b/x11-packages/qemu-system-x86-64/0006-add-missing-sigorset.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0006-add-missing-sigorset.patch rename to x11-packages/qemu-system-x86-64/0006-add-missing-sigorset.patch diff --git a/x11-packages/qemu-system-x86_64/0007-fix-sem.h-location.patch b/x11-packages/qemu-system-x86-64/0007-fix-sem.h-location.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0007-fix-sem.h-location.patch rename to x11-packages/qemu-system-x86-64/0007-fix-sem.h-location.patch diff --git a/x11-packages/qemu-system-x86_64/0008-fix-syscalls.patch b/x11-packages/qemu-system-x86-64/0008-fix-syscalls.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0008-fix-syscalls.patch rename to x11-packages/qemu-system-x86-64/0008-fix-syscalls.patch diff --git a/x11-packages/qemu-system-x86_64/0009-fix-struct-member-conflicts.patch b/x11-packages/qemu-system-x86-64/0009-fix-struct-member-conflicts.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0009-fix-struct-member-conflicts.patch rename to x11-packages/qemu-system-x86-64/0009-fix-struct-member-conflicts.patch diff --git a/x11-packages/qemu-system-x86_64/0010-fix-mman.h-defs.patch b/x11-packages/qemu-system-x86-64/0010-fix-mman.h-defs.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0010-fix-mman.h-defs.patch rename to x11-packages/qemu-system-x86-64/0010-fix-mman.h-defs.patch diff --git a/x11-packages/qemu-system-x86_64/0011-disable-glob.h-include.patch b/x11-packages/qemu-system-x86-64/0011-disable-glob.h-include.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0011-disable-glob.h-include.patch rename to x11-packages/qemu-system-x86-64/0011-disable-glob.h-include.patch diff --git a/x11-packages/qemu-system-x86_64/0012-reserve-space-for-brk.patch b/x11-packages/qemu-system-x86-64/0012-reserve-space-for-brk.patch similarity index 100% rename from x11-packages/qemu-system-x86_64/0012-reserve-space-for-brk.patch rename to x11-packages/qemu-system-x86-64/0012-reserve-space-for-brk.patch diff --git a/x11-packages/qemu-system-x86_64/build.sh b/x11-packages/qemu-system-x86-64/build.sh similarity index 95% rename from x11-packages/qemu-system-x86_64/build.sh rename to x11-packages/qemu-system-x86-64/build.sh index 3f3db3ef2..4835341e0 100644 --- a/x11-packages/qemu-system-x86_64/build.sh +++ b/x11-packages/qemu-system-x86-64/build.sh @@ -5,9 +5,13 @@ TERMUX_PKG_MAINTAINER="Leonid Pliushch " # Do not update version unless you verified that it works properly. _PACKAGE_VERSION=4.2.1 TERMUX_PKG_VERSION=1:${_PACKAGE_VERSION} +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://download.qemu.org/qemu-${_PACKAGE_VERSION}.tar.xz TERMUX_PKG_SHA256="7e331163b72e7bcf63bd35cb85cba87b48d12fab3f264b94c23f7d3991094207" TERMUX_PKG_DEPENDS="attr, glib, libbz2, libc++, libcap, libcurl, libgcrypt, libiconv, libjpeg-turbo, liblzo, libnfs, libpixman, libpng, libssh, libx11, ncurses, qemu-common, resolv-conf, sdl2, sdl2-image, zlib" +TERMUX_PKG_CONFLICTS="qemu-system-x86_64" +TERMUX_PKG_REPLACES="qemu-system-x86_64" +TERMUX_PKG_PROVIDES="qemu-system-x86_64" TERMUX_PKG_BUILD_IN_SRC=true # Remove files already present in qemu-utils and qemu-common. 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 similarity index 100% rename from x11-packages/qemu-system-x86_64/qemu-system-aarch64.subpackage.sh rename to x11-packages/qemu-system-x86-64/qemu-system-aarch64.subpackage.sh 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 similarity index 100% rename from x11-packages/qemu-system-x86_64/qemu-system-arm.subpackage.sh rename to x11-packages/qemu-system-x86-64/qemu-system-arm.subpackage.sh 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 similarity index 100% rename from x11-packages/qemu-system-x86_64/qemu-system-i386.subpackage.sh rename to x11-packages/qemu-system-x86-64/qemu-system-i386.subpackage.sh diff --git a/x11-packages/qemu-system-x86_64/qemu-system-riscv32.subpackage.sh b/x11-packages/qemu-system-x86-64/qemu-system-riscv32.subpackage.sh similarity index 100% rename from x11-packages/qemu-system-x86_64/qemu-system-riscv32.subpackage.sh rename to x11-packages/qemu-system-x86-64/qemu-system-riscv32.subpackage.sh diff --git a/x11-packages/qemu-system-x86_64/qemu-system-riscv64.subpackage.sh b/x11-packages/qemu-system-x86-64/qemu-system-riscv64.subpackage.sh similarity index 100% rename from x11-packages/qemu-system-x86_64/qemu-system-riscv64.subpackage.sh rename to x11-packages/qemu-system-x86-64/qemu-system-riscv64.subpackage.sh