summaryrefslogtreecommitdiff
path: root/user
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-08-30 21:43:11 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-08-30 21:43:11 +0000
commit9aba141101b1bb11cdf80e92d427e94f0d5ddb0e (patch)
treebfe4ecd39a91c68910a52d363a7b76c58a964017 /user
parent5c63d812bda6296defe8021f014cbed496759312 (diff)
downloadpackages-9aba141101b1bb11cdf80e92d427e94f0d5ddb0e.tar.gz
packages-9aba141101b1bb11cdf80e92d427e94f0d5ddb0e.tar.bz2
packages-9aba141101b1bb11cdf80e92d427e94f0d5ddb0e.tar.xz
packages-9aba141101b1bb11cdf80e92d427e94f0d5ddb0e.zip
user/qemu: bump to 2.12.1, add -dbg
Diffstat (limited to 'user')
-rw-r--r--user/qemu/APKBUILD24
1 files changed, 17 insertions, 7 deletions
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index d1717c62f..3e0be560a 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -4,12 +4,12 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qemu
-pkgver=2.12.0
+pkgver=2.12.1
pkgrel=0
-pkgdesc="QEMU is a generic machine emulator and virtualizer"
-url="http://qemu.org/"
+pkgdesc="Machine emulator and virtualisation software"
+url="https://www.qemu.org/"
arch="all"
-license="GPL-2.0-only LGPL-2.1-only"
+license="GPL-2.0-only AND LGPL-2.1-only"
makedepends="
alsa-lib-dev
bison
@@ -51,7 +51,7 @@ install="$pkgname.pre-install $pkgname.post-install"
# strip fails on .img files
# some tests does not run on our builders
# ROMs confuse dbg
-options="suid !strip !check !dbg"
+options="suid !strip !check"
subpackages="$pkgname-doc $pkgname-lang $pkgname-guest-agent:guest
$pkgname-user $pkgname-system"
@@ -136,7 +136,7 @@ fi
subpackages="$subpackages $pkgname-img" # -img must be declared the last
-source="http://wiki.qemu-project.org/download/$pkgname-$pkgver.tar.bz2
+source="https://download.qemu.org/$pkgname-$pkgver.tar.xz
0001-elfload-load-PIE-executables-to-right-address.patch
0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
0001-linux-user-fix-build-with-musl-on-aarch64.patch
@@ -343,6 +343,16 @@ img() {
return $retval
}
+dbg() {
+ # God, save me.
+ local _save="$srcdir"/tmpshare
+ # default_dbg uses srcdir for its own purposes;
+ # its value cannot be used after it is executed
+ mv "$pkgdir"/usr/share/qemu $_save
+ default_dbg
+ mv $_save "$pkgdir"/usr/share/qemu
+}
+
user() {
pkgdesc="All QEMU user targets (metapackage)"
depends=""
@@ -377,7 +387,7 @@ guest() {
"$subpkgdir"/etc/conf.d/$pkgname-guest-agent
}
-sha512sums="91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346 qemu-2.12.0.tar.bz2
+sha512sums="e05c2bcd06640322452e64e26e4964b3bc9419645de8356f4e83484e37968a0b47dc8377c8c6641941973b247cb0dc22c7dad302d039baa194b1864f2c6ad7e4 qemu-2.12.1.tar.xz
405008589cad1c8b609eca004d520bf944366e8525f85a19fc6e283c95b84b6c2429822ba064675823ab69f1406a57377266a65021623d1cd581e7db000134fd 0001-elfload-load-PIE-executables-to-right-address.patch
ec84b27648c01c6e58781295dcd0c2ff8e5a635f9836ef50c1da5d0ed125db1afc4cb5b01cb97606d6dd8f417acba93e1560d9a32ca29161a4bb730b302440ea 0006-linux-user-signal.c-define-__SIGRTMIN-MAX-for-non-GN.patch
1ac043312864309e19f839a699ab2485bca51bbf3d5fdb39f1a87b87e3cbdd8cbda1a56e6b5c9ffccd65a8ac2f600da9ceb8713f4dbba26f245bc52bcd8a1c56 0001-linux-user-fix-build-with-musl-on-aarch64.patch