Restore the package to the glory

7 files changed, 52 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d6ce947fd03..9d1a816430f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,23 @@
-# Generated by mksrcinfo v8
-# Wed Feb 10 00:44:34 UTC 2016
 pkgbase = qemu-arm-static
-	pkgdesc = Universal CPU emulator
-	pkgver = 1.6.0
-	pkgrel = 3.1
-	url = http://www.qemu.org
-	arch = i686
+	pkgdesc = Statically linked qemu-arm, qemu-armeb and qemu-aarch64 executables from Alpine
+	pkgver = 2.8.1r1
+	pkgrel = 2
+	url = https://alpinelinux.org/
+	install = qemu-arm-static.install
 	arch = x86_64
 	license = GPL2
-	makedepends = python2
-	source = http://download.tizen.org/tools/archive/14.03.1/openSUSE_13.1/src/qemu-arm-static-1.6.0rc3-3.1.src.rpm
-	sha256sums = 5e031095000f5fd97577bb1743f3ccafe41c63b4c83b6ee93778bbee76cda53d
+	source = http://rsync.alpinelinux.org/alpine/v3.6/main/x86_64/qemu-aarch64-2.8.1-r1.apk
+	source = http://rsync.alpinelinux.org/alpine/v3.6/main/x86_64/qemu-arm-2.8.1-r1.apk
+	source = http://rsync.alpinelinux.org/alpine/v3.6/main/x86_64/qemu-armeb-2.8.1-r1.apk
+	source = aarch64.binfmt
+	source = arm.binfmt
+	source = armeb.binfmt
+	sha256sums = 4a848f54612bf112277d4dee2460f96dce3c2c47a153ebbe199648335de2931b
+	sha256sums = 5cb691a4699365005347c01187a17042ee301f7d0b25f1640bb5b945cf7c09e2
+	sha256sums = c82a104fe83ee136a7c8325c1ea34f293e5cdea32276d24e970ec5d0a6027387
+	sha256sums = b013b13d3b304a6d66c332828be3c93e8643c0c1ee217b0f1152d0c9dc78c059
+	sha256sums = 805ab50d386b5e17c5a072217ed8d49450df079fcb76d6826427cea5b862474f
+	sha256sums = fdaa63e61e625457c7de848cbcec8e6c6864a3cd12d8c3ee8e24cdd861be32b0
 
 pkgname = qemu-arm-static
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..6f866b520950
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.apk
+*.pkg.tar.xz
+*.sig
+logs/
diff --git a/PKGBUILD b/PKGBUILD
index 246d3a40bad6..1d745eda4ac3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,29 @@
-# Maintainer: Junchun Guan <junchunx.guan@gmail.com>
-pkgname=qemu-arm-static
-pkgver=1.6.0
-pkgrel=3.1
-pkgdesc="Universal CPU emulator"
-url="http://www.qemu.org"
-arch=('i686' 'x86_64')
-license=("GPL2")
-makedepends=(python2)
-source=(http://download.tizen.org/tools/archive/14.03.1/openSUSE_13.1/src/qemu-arm-static-1.6.0rc3-3.1.src.rpm)
-sha256sums=('5e031095000f5fd97577bb1743f3ccafe41c63b4c83b6ee93778bbee76cda53d')
-
-prepare()
-{
-  cd "$srcdir"
-  tar -x -f qemu-$pkgver-rc3.tar.bz2
-  cd "$srcdir/qemu-${pkgver}-rc3"
-  for patch_file in $(find ../ -maxdepth 1 -name '*.patch' |sort)
-  do
-    patch -p1 -i $patch_file
-  done
-}
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
-build() {
-   cd "$srcdir/qemu-$pkgver-rc3"
-  ./configure \
-	--prefix=/usr \
-	--libexecdir=/usr/lib \
-	--target-list="arm-linux-user,arm64-linux-user" \
-	--disable-tools \
-	--disable-guest-agent \
-	--disable-docs \
-	--disable-system \
-	--disable-werror \
-	--disable-linux-aio \
-	--disable-fdt \
-	--disable-sdl \
-        --enable-linux-user \
-        --python=/usr/bin/python2 \
-#        --static
-}
+pkgname=qemu-arm-static
+pkgver=2.8.1r1
+_pkgver=${pkgver/r/-r}
+pkgrel=2
+pkgdesc='Statically linked qemu-arm, qemu-armeb and qemu-aarch64 executables from Alpine'
+arch=(x86_64)
+url='https://alpinelinux.org/'
+license=(GPL2)
+install=$pkgname.install
+source=(http://rsync.alpinelinux.org/alpine/v3.6/main/x86_64/qemu-aarch64-$_pkgver.apk
+        http://rsync.alpinelinux.org/alpine/v3.6/main/x86_64/qemu-arm-$_pkgver.apk
+        http://rsync.alpinelinux.org/alpine/v3.6/main/x86_64/qemu-armeb-$_pkgver.apk
+        aarch64.binfmt arm.binfmt armeb.binfmt
+)
+sha256sums=('4a848f54612bf112277d4dee2460f96dce3c2c47a153ebbe199648335de2931b'
+            '5cb691a4699365005347c01187a17042ee301f7d0b25f1640bb5b945cf7c09e2'
+            'c82a104fe83ee136a7c8325c1ea34f293e5cdea32276d24e970ec5d0a6027387'
+            'b013b13d3b304a6d66c332828be3c93e8643c0c1ee217b0f1152d0c9dc78c059'
+            '805ab50d386b5e17c5a072217ed8d49450df079fcb76d6826427cea5b862474f'
+            'fdaa63e61e625457c7de848cbcec8e6c6864a3cd12d8c3ee8e24cdd861be32b0')
 
 package() {
-  cd "$srcdir/qemu-$pkgver-rc3"
-  make install DESTDIR="$pkgdir"
-  install -m755 $srcdir/qemu-binfmt-conf.sh $pkgdir/usr/bin/qemu-binfmt-conf.sh
-  mv $pkgdir/usr/bin/qemu-arm $pkgdir/usr/bin/qemu-arm-static
-  mv $pkgdir/usr/bin/qemu-arm64 $pkgdir/usr/bin/qemu-arm64-static
-  rm -rf $pkgdir/usr/{lib,include,share,etc}
-  rm -rf $pkgdir/usr/bin/vscclient
+  for arch in aarch64 arm armeb; do
+    install -Dm755 usr/bin/qemu-$arch "$pkgdir/usr/bin/qemu-${arch}-static"
+    install -Dm644 ${arch}.binfmt "$pkgdir/usr/lib/binfmt.d/${arch}.conf"
+  done
 }
diff --git a/aarch64.binfmt b/aarch64.binfmt
new file mode 100644
index 000000000000..05cb6cb0b64e
--- /dev/null
+++ b/aarch64.binfmt
@@ -0,0 +1 @@
+:aarch64:M:0:\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-aarch64-static:
diff --git a/arm.binfmt b/arm.binfmt
new file mode 100644
index 000000000000..89efa87fac06
--- /dev/null
+++ b/arm.binfmt
@@ -0,0 +1 @@
+:arm:M:0:\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:
diff --git a/armeb.binfmt b/armeb.binfmt
new file mode 100644
index 000000000000..6c91a729f77c
--- /dev/null
+++ b/armeb.binfmt
@@ -0,0 +1 @@
+:armeb:M:0:\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:
diff --git a/qemu-arm-static.install b/qemu-arm-static.install
new file mode 100644
index 000000000000..f3906cb5bcfb
--- /dev/null
+++ b/qemu-arm-static.install
@@ -0,0 +1,3 @@
+post_install() {
+  /usr/lib/systemd/systemd-binfmt
+}