v4.0.1

2 files changed, 54 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 823e715011dc..8cf0e2215d82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qemu-user-static
 	pkgdesc = Statically linked binaries of Qemu with user emulation. Useful for containers/chroot environment with binfmt.
-	pkgver = 4.0.0
+	pkgver = 4.1.0
 	pkgrel = 1
 	url = http://wiki.qemu.org/
 	arch = x86_64
@@ -9,10 +9,10 @@ pkgbase = qemu-user-static
 	makedepends = python2
 	makedepends = glib2-static
 	makedepends = pcre-static
-	source = https://download.qemu.org/qemu-4.0.0.tar.xz
-	source = https://download.qemu.org/qemu-4.0.0.tar.xz.sig
+	source = https://download.qemu.org/qemu-4.1.0.tar.xz
+	source = https://download.qemu.org/qemu-4.1.0.tar.xz.sig
 	validpgpkeys = CEACC9E15534EBABB82D3FA03353C9CEF108B584
-	sha512sums = 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
+	sha512sums = 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2
 	sha512sums = SKIP
 
 pkgname = qemu-user-static
diff --git a/PKGBUILD b/PKGBUILD
index 0d10ceadb65c..22aad7155345 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=qemu-user-static
 pkgdesc="Statically linked binaries of Qemu with user emulation. Useful for containers/chroot environment with binfmt."
-pkgver=4.0.0
+pkgver=4.1.0
 pkgrel=1
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
@@ -11,7 +11,7 @@ depends=()
 makedepends=(python2 glib2-static pcre-static)
 source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig})
 sha512sums=(
-  '952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13'
+  '82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2'
   'SKIP'
 )
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
@@ -21,55 +21,60 @@ case $CARCH in
   x86_64) _corearch=x86_64 ;;
 esac
 
+# If non empty, always run the configure script
+: "${FORCE_CONFIGURE:=1}"
+
 prepare() {
   mkdir build-user-static
 
   cd qemu-${pkgver}
-  sed -i 's/vte-2\.90/vte-2.91/g' configure
+  #sed -i 's/vte-2\.90/vte-2.91/g' configure
+}
+
+_configure() {
+    ../qemu-${pkgver}/configure \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --libexecdir=/usr/lib/qemu \
+            --enable-linux-user \
+            --disable-debug-info \
+            --disable-bsd-user \
+            --disable-werror \
+            --disable-system \
+            --disable-tools \
+            --disable-docs \
+            --disable-gtk \
+            --disable-gnutls \
+            --disable-nettle \
+            --disable-gcrypt \
+            --disable-glusterfs \
+            --disable-libnfs \
+            --disable-libiscsi \
+            --disable-vnc \
+            --disable-kvm \
+            --disable-libssh \
+            --disable-libxml2 \
+            --disable-vde \
+            --disable-sdl \
+            --disable-opengl \
+            --disable-xen \
+            --disable-kvm \
+            --disable-fdt \
+            --disable-vhost-net \
+            --disable-vhost-crypto \
+            --disable-vhost-user \
+            --disable-vhost-vsock \
+            --disable-vhost-scsi \
+            --disable-tpm \
+            --disable-qom-cast-debug \
+            --disable-capstone \
+            --static
 }
 
 build() (
   cd build-user-static
-
-  ../qemu-${pkgver}/configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/qemu \
-    --enable-linux-user \
-    --disable-debug-info \
-    --disable-bsd-user \
-    --disable-werror \
-    --disable-system \
-    --disable-tools \
-    --disable-docs \
-    --disable-gtk \
-    --disable-gnutls \
-    --disable-nettle \
-    --disable-gcrypt \
-    --disable-glusterfs \
-    --disable-libnfs \
-    --disable-libiscsi \
-    --disable-vnc \
-    --disable-kvm \
-    --disable-libssh2 \
-    --disable-libxml2 \
-    --disable-vde \
-    --disable-sdl \
-    --disable-opengl \
-    --disable-xen \
-    --disable-kvm \
-    --disable-fdt \
-    --disable-vhost-net \
-    --disable-vhost-crypto \
-    --disable-vhost-user \
-    --disable-vhost-vsock \
-    --disable-vhost-scsi \
-    --disable-tpm \
-    --disable-qom-cast-debug \
-    --disable-capstone \
-    --static
-
+  [[ ! $FORCE_CONFIGURE && -e ../qemu-${pkgver}/config.log ]] || _configure
   make ARFLAGS="rc"
 )
 
@@ -81,10 +86,10 @@ package() {
 
   # remove conflicting /var/run directory
   cd "$pkgdir"
-  rm -r var
+  rm -rf var
 
   # Remove BIOS files etc...
-  rm -r usr/share
+  rm -rf usr/share
 
   # Rename static qemu binaries
   cd "${pkgdir}/usr/bin/"