Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=cdbdd0ce0542d6a29f8803136085efed7267a1ad
commit cdbdd0ce0542d6a29f8803136085efed7267a1ad Author: Daniel Exner <[email protected]> Date: Sat Feb 21 22:03:23 2015 +0100 qemu-2.2.0-1-x86_64 * version bump + add qemu-static subpackage diff --git a/source/xapps-extra/qemu/FrugalBuild b/source/xapps-extra/qemu/FrugalBuild index bea19ed..6081e20 100644 --- a/source/xapps-extra/qemu/FrugalBuild +++ b/source/xapps-extra/qemu/FrugalBuild @@ -7,15 +7,15 @@ USE_DEVEL=${USE_DEVEL:-"n"} # TODO: considering adding support for KSM pkgname=qemu -pkgver=1.6.1 +pkgver=2.2.0 Fuse $USE_DEVEL && pkgver=svn6369 -pkgrel=9 +pkgrel=1 Fuse $USE_DEVEL && pkgrel=1 pkgdesc="QEMU is a FAST! processor emulator" url="http://www.nongnu.org/qemu/" rodepends=('libcacard') depends=('libx11' 'sdl' 'alsa-lib' 'cyrus-sasl' 'nss' 'libgl' 'pixman' 'libpng' 'libjpeg' 'spice-server' 'spice-protocol' 'usbredir>=0.7') -makedepends=('texi2html' 'xfsprogs' 'mesa-libgl-headers') +makedepends=('texi2html' 'xfsprogs' 'mesa-libgl-headers' 'glib2-static' 'pcre-static') replaces=('kqemu' 'qemu-kvm') conflicts=('kqemu' 'qemu-kvm') provides=('kqemu' 'qemu-kvm') @@ -24,7 +24,7 @@ archs=('i686' 'x86_64') up2date="Flasttar http://wiki.qemu.org/download" source=(http://wiki.qemu.org/download/${pkgname}-${pkgver//_/-}.tar.bz2 \ qemu.conf 49-kvm.rules qemu-guest-agent.service 99-qemu-guest-agent.rules README.Frugalware) -sha1sums=('ad3ef3709a8ce3a39bd343aa313cefd033afb561' \ +sha1sums=('9a16623775a92fd25334f4eced4e6a56ab536233' \ 'b44a774fe5ebcf52275ee0fc33a9654c157204ca' \ '9d9f293fb01d91c12e2f95ba6401a1f1570d70fb' \ '435373031bc0a1fed8abadab912460ddf98bc1c2' \ @@ -39,32 +39,28 @@ if Fuse $USE_DEVEL; then Finclude scm fi -subpkgs=('qemu-guest' 'libcacard') -subdescs=('Files for use in QEMU guests.' 'Common Access Card (CAC) Emulation') -subgroups=('apps-extra' 'lib-extra') -subarchs=('i686 x86_64' 'i686 x86_64') -subdepends=('glib2' 'glib2 nss') +subpkgs=('qemu-guest' 'libcacard' 'qemu-static') +subdescs=('Files for use in QEMU guests.' 'Common Access Card (CAC) Emulation' 'QEMU compiled static') +subgroups=('apps-extra' 'lib-extra' 'apps-extra') +subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64') +subdepends=('glib2' 'glib2 nss' '') TARGETS="i386-softmmu x86_64-softmmu arm-softmmu" +TARGETS_USER="alpha-linux-user armeb-linux-user arm-linux-user \ + cris-linux-user i386-linux-user m68k-linux-user \ + microblazeel-linux-user microblaze-linux-user \ + mips64el-linux-user mips64-linux-user \ + mipsel-linux-user mips-linux-user \ + mipsn32el-linux-user mipsn32-linux-user \ + or32-linux-user ppc64abi32-linux-user \ + ppc64-linux-user ppc-linux-user s390x-linux-user \ + sh4eb-linux-user sh4-linux-user \ + sparc32plus-linux-user sparc64-linux-user \ + sparc-linux-user unicore32-linux-user \ + x86_64-linux-user" -# FSA fix *** -source=(${source[@]} CVE-2013-4375.patch CVE-2014-0150.patch CVE-2013-4544.patch - CVE-2014-2894.patch CVE-2014-3640.patch CVE-2014-3615.patch - CVE-2014-3689.patch CVE-2014-7815.patch CVE-2014-8106-1.patch - CVE-2014-8106-2.patch CVE-2014-7840.patch) -sha1sums=(${sha1sums[@]} '761b353dbbd110fd8e75e0e5f471effdc8e37beb' \ - '21f8788763786778efff306e07d0f0dc64aabb36' \ - 'f878bda3babc020d8c36b63b8c938acffc0bf29e' \ - 'ed600afeed4df631f5adc2bc6cc353ee691ec432' \ - '47a312a667488b3be2c94ea2c7bb5bdcb923f247' \ - '3fe6dce9a5daac9088fdfdea86cfae3ab5c05f81' \ - '1beb3322a61033344c0f6a80019160c26052872a' \ - 'dc3bf6ed322dfd24e4e7fc5031b2d19f27112ce4' \ - 'ef90523bbee7e5dc60ff03ab0cedcb5b972089ff' \ - '9b974cfac92f7977c1b0263a8dfc7c41a57c308f' \ - '59ba5cd08956e31cf08001495da829861c2d37a2') -# *********** - +Fconfopts="$Fconfopts --disable-qom-cast-debug \ + --enable-usb-redir" build() { @@ -72,7 +68,19 @@ build() Funpack_scm fi Fcd $pkgname-${pkgver%%_*} - Fbuild --audio-drv-list=alsa,oss --target-list="$TARGETS" --disable-qom-cast-debug --enable-spice --enable-usb-redir + + # Build static binaries + Fbuild --target-list="${TARGETS_USER}" --static --disable-werror \ + --disable-docs --disable-gtk --disable-vnc \ + --enable-user \ + --disable-virtfs \ + --disable-kvm --disable-libssh2 + Fsplit qemu-static /usr/bin/qemu-\* + make clean || Fdie + + # Build the real thing + Fmake --target-list="$TARGETS" --audio-drv-list=alsa,oss --enable-spice + Fmakeinstall Fdoc README.Frugalware Ffile /etc/binfmt.d/qemu.conf Ffile /lib/udev/rules.d/49-kvm.rules _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
