main/qemu: enable user emulation and rename the system emulators

1 files changed, 93 insertions, 37 deletions

diff --git a/main/qemu/APKBUILD b/main/qemu/APKBUILD
index b302c7c3f4..16ef712adc 100644
--- a/main/qemu/APKBUILD
+++ b/main/qemu/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qemu
 pkgver=1.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="QEMU is a generic machine emulator and virtualizer"
 url="http://qemu,org/"
 arch="all"
@@ -13,31 +13,60 @@ makedepends="zlib-dev sdl-dev alsa-lib-dev gnutls-dev ncurses-dev glib-dev
 depends=
 install="qemu.pre-install"
 subpackages="
-$pkgname-alpha
-$pkgname-arm
-$pkgname-cris
-$pkgname-i386
-$pkgname-lm32
-$pkgname-m68k
-$pkgname-microblaze
-$pkgname-microblazeel
-$pkgname-mips
-$pkgname-mips64
-$pkgname-mips64el
-$pkgname-mipsel
-$pkgname-ppc
-$pkgname-ppc64
-$pkgname-ppcemb
-$pkgname-sh4
-$pkgname-s390x
-$pkgname-sh4eb
-$pkgname-sparc
-$pkgname-sparc64
-$pkgname-x86_64
-$pkgname-xtensa
-$pkgname-xtensaeb
-$pkgname-or32
-$pkgname-unicore32
+$pkgname-alpha:alpha
+$pkgname-arm:arm
+$pkgname-armeb:armeb
+$pkgname-cris:cris
+$pkgname-i386:i386
+$pkgname-m68k:m68k
+$pkgname-microblaze:microblaze
+$pkgname-microblazeel:microblazeel
+$pkgname-mips:mips
+$pkgname-mips64:mips64
+$pkgname-mips64el:mips64el
+$pkgname-mipsel:mipsel
+$pkgname-mipsn32:mipsn32
+$pkgname-mipsn32el:mipsn32el
+$pkgname-or32:or32
+$pkgname-ppc:ppc
+$pkgname-ppc64:ppc64
+$pkgname-ppc64abi32:ppc64abi32
+$pkgname-s390x:s390x
+$pkgname-sh4:sh4
+$pkgname-sh4eb:sh4eb
+$pkgname-sparc:sparc
+$pkgname-sparc32plus:sparc32plus
+$pkgname-sparc64:sparc64
+$pkgname-system-alpha:system_alpha
+$pkgname-system-arm:system_arm
+$pkgname-system-cris:system_cris
+$pkgname-system-i386:system_i386
+$pkgname-system-lm32:system_lm32
+$pkgname-system-m68k:system_m68k
+$pkgname-system-microblaze:system_microblaze
+$pkgname-system-microblazeel:system_microblazeel
+$pkgname-system-mips:system_mips
+$pkgname-system-mips64:system_mips64
+$pkgname-system-mips64el:system_mips64el
+$pkgname-system-mipsel:system_mipsel
+$pkgname-system-moxie:system_moxie
+$pkgname-system-or32:system_or32
+$pkgname-system-ppc:system_ppc
+$pkgname-system-ppc64:system_ppc64
+$pkgname-system-ppcemb:system_ppcemb
+$pkgname-system-s390x:system_s390x
+$pkgname-system-sh4:system_sh4
+$pkgname-system-sh4eb:system_sh4eb
+$pkgname-system-sparc:system_sparc
+$pkgname-system-sparc64:system_sparc64
+$pkgname-system-unicore32:system_unicore32
+$pkgname-system-x86_64:system_x86_64
+$pkgname-system-xtensa:system_xtensa
+$pkgname-system-xtensaeb:system_xtensaeb
+$pkgname-unicore32:unicore32
+$pkgname-x86_64:x86_64
+
+$pkgname-lang
 $pkgname-img
 $pkgname-guest-agent:guest
 "
@@ -82,7 +111,7 @@ build() {
 		--enable-sdl \
 		--enable-gtk \
 		--disable-bsd-user \
-		--disable-linux-user \
+		--enable-linux-user \
 		--disable-werror \
 		--cc="${CC:-gcc}" \
 		|| return 1
@@ -103,17 +132,17 @@ package() {
 }
 
 _subsys() {
-	pkgdesc="Qemu $1 system emulator"
+	pkgdesc="Qemu ${1/-/ } emulator"
 	depends="qemu"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/qemu-system-$1 "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/qemu-$1 "$subpkgdir"/usr/bin/ || return 1
 }
 
 alpha() { _subsys alpha; }
 arm() { _subsys arm; }
+armeb() { _subsys armeb; }
 cris() { _subsys cris; }
 i386() { _subsys i386; }
-lm32() { _subsys lm32; }
 m68k() { _subsys m68k; }
 microblaze() { _subsys microblaze; }
 microblazeel() { _subsys microblazeel; }
@@ -121,19 +150,46 @@ mips() { _subsys mips; }
 mips64() { _subsys mips64; }
 mips64el() { _subsys mips64el; }
 mipsel() { _subsys mipsel; }
+mipsn32() { _subsys mipsn32; }
+mipsn32el() { _subsys mipsn32el; }
+or32() { _subsys or32; }
 ppc() { _subsys ppc; }
 ppc64() { _subsys ppc64; }
-ppcemb() { _subsys ppcemb; }
+ppc64abi32() { _subsys ppc64abi32; }
 s390x() { _subsys s390x; }
 sh4() { _subsys sh4; }
 sh4eb() { _subsys sh4eb; }
 sparc() { _subsys sparc; }
+sparc32plus() { _subsys sparc32plus; }
 sparc64() { _subsys sparc64; }
-x86_64() { _subsys x86_64; }
-xtensa() { _subsys xtensa; }
-xtensaeb() { _subsys xtensaeb; }
-or32() { _subsys or32; }
+system_alpha() { _subsys system-alpha; }
+system_arm() { _subsys system-arm; }
+system_cris() { _subsys system-cris; }
+system_i386() { _subsys system-i386; }
+system_lm32() { _subsys system-lm32; }
+system_m68k() { _subsys system-m68k; }
+system_microblaze() { _subsys system-microblaze; }
+system_microblazeel() { _subsys system-microblazeel; }
+system_mips() { _subsys system-mips; }
+system_mips64() { _subsys system-mips64; }
+system_mips64el() { _subsys system-mips64el; }
+system_mipsel() { _subsys system-mipsel; }
+system_moxie() { _subsys system-moxie; }
+system_or32() { _subsys system-or32; }
+system_ppc() { _subsys system-ppc; }
+system_ppc64() { _subsys system-ppc64; }
+system_ppcemb() { _subsys system-ppcemb; }
+system_s390x() { _subsys system-s390x; }
+system_sh4() { _subsys system-sh4; }
+system_sh4eb() { _subsys system-sh4eb; }
+system_sparc() { _subsys system-sparc; }
+system_sparc64() { _subsys system-sparc64; }
+system_unicore32() { _subsys system-unicore32; }
+system_x86_64() { _subsys system-x86_64; }
+system_xtensa() { _subsys system-xtensa; }
+system_xtensaeb() { _subsys system-xtensaeb; }
 unicore32() { _subsys unicore32; }
+x86_64() { _subsys x86_64; }
 
 img() {
 	pkgdesc="QEMU command line tool for manipulating disk images"
@@ -143,7 +199,7 @@ img() {
 		"$pkgdir"/usr/bin/qemu-io \
 		"$subpkgdir"/usr/bin/
 
-	# we exploit the fact that -img subpackage are craeted last
+	# we exploit the fact that -img subpackage are created last
 	# and check that we done have new systems that belongs in
 	# subpackage
 	local _bins= _ret=0
@@ -153,7 +209,7 @@ img() {
 			_ret=1
 		fi
 	done
-	return $_err
+	return $_ret
 }
 
 guest() {