Subject: [alpine-aports] [PATCH] main/qemu: upgrade to 2.10.1

From: Daniel Sabogal <[email-masked]>
Date: Mon, 9 Oct 2017 12:43:37 -0400

Enable hppa and tilegx targets
---
 .../0001-linux-user-fix-build-with-musl-on-aarch64.patch     |  2 +-
 .../0001-linux-user-fix-build-with-musl-on-ppc64le.patch     |  2 +-
 main/qemu/APKBUILD                                           | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch b/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch
index 9bb534cebe..47b30031e2 100644
--- a/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch
+++ b/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch
@@ -23,7 +23,7 @@ index 64f75cef49..6fd6e36b2a 100644
 @@ -25,7 +25,7 @@ extern char safe_syscall_end[];
  static inline void rewind_if_in_safe_syscall(void *puc)
  {
-     struct ucontext *uc = puc;
+     ucontext_t *uc = puc;
 -    __u64 *pcreg = &uc->uc_mcontext.pc;
 +    uint64_t *pcreg = &uc->uc_mcontext.pc;
  
diff --git a/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch b/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch
index 4d028091a0..e73995a6cc 100644
--- a/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch
+++ b/main/qemu/0001-linux-user-fix-build-with-musl-on-ppc64le.patch
@@ -3,7 +3,7 @@
 @@ -25,7 +25,11 @@
  static inline void rewind_if_in_safe_syscall(void *puc)
  {
-     struct ucontext *uc = puc;
+     ucontext_t *uc = puc;
 +#if defined(__GLIBC__) || defined(__UCLIBC__)
      unsigned long *pcreg = &uc->uc_mcontext.gp_regs[PT_NIP];
 +#else // Musl
diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index ddd30980f1..1c5fa8bc31 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jakub Jirutka <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=qemu
-pkgver=2.9.0
-pkgrel=2
+pkgver=2.10.1
+pkgrel=0
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu.org/"
 arch="all"
@@ -51,6 +51,7 @@ _subsystems="
 	arm
 	armeb
 	cris
+	hppa
 	i386
 	m68k
 	microblaze
@@ -101,6 +102,7 @@ _subsystems="
 	system-x86_64
 	system-xtensa
 	system-xtensaeb
+	tilegx
 	x86_64
 	"
 for _sub in $_subsystems; do
@@ -331,16 +333,16 @@ guest() {
 		"$subpkgdir"/etc/conf.d/$pkgname-guest-agent
 }
 
-sha512sums="4b28966eec0ca44681e35fcfb64a4eaef7c280b8d65c91d03f2efa37f76278fd8c1680e5798c7a30dbfcc8f3c05f4a803f48b8a2dfec3a4181bac079b2a5e422  qemu-2.9.0.tar.bz2
+sha512sums="1a4a6ebf700ec6851c83cc2a71eaea8d95f14c685d094eaaa86c740eb9401e49a79074b72385f58681ca7646771a99bb6bbd9bebb39162f7220626d37ed0654f  qemu-2.10.1.tar.bz2
 405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd  0001-elfload-load-PIE-executables-to-right-address.patch
 ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea  0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
-4431dad803156d424a6c9fc74783762590b27fcb3bfadb6b23b149bc9e71c31f139991541aa4e0583c17ac531242dff02ebf4d5a8f9a9a77be757fb30cb65565  0001-linux-user-fix-build-with-musl-on-aarch64.patch
+dafe0483319b2a8e530bc758711ba3c991854a93ce81ef6335dd884c95181845eb3c8e56bc9dbb7dec2b3ea4ab74fc81508db7ab03e289a855b24798f611e5b7  0001-linux-user-fix-build-with-musl-on-aarch64.patch
 224f5b44da749921e8a821359478c5238d8b6e24a9c0b4c5738c34e82f3062ec4639d495b8b5883d304af4a0d567e38aa6623aac1aa3a7164a5757c036528ac0  musl-F_SHLCK-and-F_EXLCK.patch
 5da8114b9bd2e62f0f1f0f73f393fdbd738c5dea827ea60cedffd6f6edd0f5a97489c7148d37a8ec5a148d4e65d75cbefe9353714ee6b6f51a600200133fc914  fix-sigevent-and-sigval_t.patch
 4b1e26ba4d53f9f762cbd5cea8ef6f8062d827ae3ae07bc36c5b0c0be4e94fc1856ad2477e8e791b074b8a25d51ed6d0ddd75e605e54600e5dd0799143793ce4  xattr_size_max.patch
 b6ed02aaf95a9bb30a5f107d35371207967edca058f3ca11348b0b629ea7a9c4baa618db68a3df72199eea6d86d14ced74a5a229d17604cc3f0adedcfeae7a73  ncurses.patch
 fd178f2913639a0c33199b3880cb17536961f2b3ff171c12b27f4be6bca032d6b88fd16302d09c692bb34883346babef5c44407a6804b20a39a465bb2bc85136  ignore-signals-33-and-64-to-allow-golang-emulation.patch
-dd7a4616e22d9d6b04c6d81d95d17af0d638645c1aa306306fb0ed3a12b2de0fdd32d55c8142960cf22d3a705695a95f022b34ae18712678722c53cd163a5a32  0001-linux-user-fix-build-with-musl-on-ppc64le.patch
+062961104b96f2eecbc4c4c640d01574b161a9ca4b8b09b04602720f9cc08819be8d9bfc95b2407eb7e0c793817343e6cd2b19603f210b247169c913b1457502  0001-linux-user-fix-build-with-musl-on-ppc64le.patch
 f0f99dc4f7fb475e3fab0262c0bc2c0dd8f17d77fe096c295fa1fc3e911ce07e1592f49c6ead7489246fecdd3a3f39f89ce05704af7f3fd384ce4f626f3c4601  fix-sockios-header.patch
 d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f  qemu-guest-agent.confd
 316b40d97587fea717821852859d81039cfdcb276a658bb6e6fb554e321d5856a833ebb3778149c4732cea625bac320b1008d374c88a9aae35c0fb67977c01b7  qemu-guest-agent.initd
-- 
2.14.2

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---