ports/opt (3.0): [notify] qemu: split port

crux at crux.nu crux at crux.nu
Sun Apr 7 19:50:20 UTC 2013


commit a208c7f3b0fa2d383c29bdbc51ebace2c9eb935d
Author: Thomas Penteker <tek at serverop.de>
Date:   Sun Apr 7 21:42:10 2013 +0200

    [notify] qemu: split port
    
    qemu is now split into qemu with support for the x86 platform (both 32 and 64
    bit and system and user emulation) and a qemu-all port that includes support
    for all available platforms.
    
    This was done to reduce build-time for the average user that will only use the
    x86 emulation.
    
    Please note, that both ports will kept in sync with regard to options and
    versions and thus should be installed in a mutually exclusive fashion.

diff --git a/qemu-all/.footprint b/qemu-all/.footprint
new file mode 100644
index 0000000..35b1bed
--- /dev/null
+++ b/qemu-all/.footprint
@@ -0,0 +1,92 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/qemu/
+-rw-r--r--	root/root	etc/qemu/target-x86_64.conf (EMPTY)
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/qemu-ga
+-rwxr-xr-x	root/root	usr/bin/qemu-i386
+-rwxr-xr-x	root/root	usr/bin/qemu-img
+-rwxr-xr-x	root/root	usr/bin/qemu-io
+-rwxr-xr-x	root/root	usr/bin/qemu-nbd
+-rwxr-xr-x	root/root	usr/bin/qemu-system-i386
+-rwxr-xr-x	root/root	usr/bin/qemu-system-x86_64
+-rwxr-xr-x	root/root	usr/bin/qemu-x86_64
+-rwxr-xr-x	root/root	usr/bin/virtfs-proxy-helper
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/qemu/
+-rwxr-xr-x	root/root	usr/lib/qemu/qemu-bridge-helper
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/qemu-img.1.gz
+-rw-r--r--	root/root	usr/man/man1/qemu.1.gz
+drwxr-xr-x	root/root	usr/man/man8/
+-rw-r--r--	root/root	usr/man/man8/qemu-nbd.8.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/qemu/
+-rw-r--r--	root/root	usr/share/qemu/acpi-dsdt.aml
+-rw-r--r--	root/root	usr/share/qemu/bamboo.dtb
+-rw-r--r--	root/root	usr/share/qemu/bios.bin
+drwxr-xr-x	root/root	usr/share/qemu/keymaps/
+-rw-r--r--	root/root	usr/share/qemu/keymaps/ar
+-rw-r--r--	root/root	usr/share/qemu/keymaps/bepo
+-rw-r--r--	root/root	usr/share/qemu/keymaps/common
+-rw-r--r--	root/root	usr/share/qemu/keymaps/da
+-rw-r--r--	root/root	usr/share/qemu/keymaps/de
+-rw-r--r--	root/root	usr/share/qemu/keymaps/de-ch
+-rw-r--r--	root/root	usr/share/qemu/keymaps/en-gb
+-rw-r--r--	root/root	usr/share/qemu/keymaps/en-us
+-rw-r--r--	root/root	usr/share/qemu/keymaps/es
+-rw-r--r--	root/root	usr/share/qemu/keymaps/et
+-rw-r--r--	root/root	usr/share/qemu/keymaps/fi
+-rw-r--r--	root/root	usr/share/qemu/keymaps/fo
+-rw-r--r--	root/root	usr/share/qemu/keymaps/fr
+-rw-r--r--	root/root	usr/share/qemu/keymaps/fr-be
+-rw-r--r--	root/root	usr/share/qemu/keymaps/fr-ca
+-rw-r--r--	root/root	usr/share/qemu/keymaps/fr-ch
+-rw-r--r--	root/root	usr/share/qemu/keymaps/hr
+-rw-r--r--	root/root	usr/share/qemu/keymaps/hu
+-rw-r--r--	root/root	usr/share/qemu/keymaps/is
+-rw-r--r--	root/root	usr/share/qemu/keymaps/it
+-rw-r--r--	root/root	usr/share/qemu/keymaps/ja
+-rw-r--r--	root/root	usr/share/qemu/keymaps/lt
+-rw-r--r--	root/root	usr/share/qemu/keymaps/lv
+-rw-r--r--	root/root	usr/share/qemu/keymaps/mk
+-rw-r--r--	root/root	usr/share/qemu/keymaps/modifiers
+-rw-r--r--	root/root	usr/share/qemu/keymaps/nl
+-rw-r--r--	root/root	usr/share/qemu/keymaps/nl-be
+-rw-r--r--	root/root	usr/share/qemu/keymaps/no
+-rw-r--r--	root/root	usr/share/qemu/keymaps/pl
+-rw-r--r--	root/root	usr/share/qemu/keymaps/pt
+-rw-r--r--	root/root	usr/share/qemu/keymaps/pt-br
+-rw-r--r--	root/root	usr/share/qemu/keymaps/ru
+-rw-r--r--	root/root	usr/share/qemu/keymaps/sl
+-rw-r--r--	root/root	usr/share/qemu/keymaps/sv
+-rw-r--r--	root/root	usr/share/qemu/keymaps/th
+-rw-r--r--	root/root	usr/share/qemu/keymaps/tr
+-rw-r--r--	root/root	usr/share/qemu/kvmvapic.bin
+-rw-r--r--	root/root	usr/share/qemu/linuxboot.bin
+-rw-r--r--	root/root	usr/share/qemu/multiboot.bin
+-rw-r--r--	root/root	usr/share/qemu/openbios-ppc
+-rw-r--r--	root/root	usr/share/qemu/openbios-sparc32
+-rw-r--r--	root/root	usr/share/qemu/openbios-sparc64
+-rw-r--r--	root/root	usr/share/qemu/palcode-clipper
+-rw-r--r--	root/root	usr/share/qemu/petalogix-ml605.dtb
+-rw-r--r--	root/root	usr/share/qemu/petalogix-s3adsp1800.dtb
+-rw-r--r--	root/root	usr/share/qemu/ppc_rom.bin
+-rw-r--r--	root/root	usr/share/qemu/pxe-e1000.rom
+-rw-r--r--	root/root	usr/share/qemu/pxe-eepro100.rom
+-rw-r--r--	root/root	usr/share/qemu/pxe-ne2k_pci.rom
+-rw-r--r--	root/root	usr/share/qemu/pxe-pcnet.rom
+-rw-r--r--	root/root	usr/share/qemu/pxe-rtl8139.rom
+-rw-r--r--	root/root	usr/share/qemu/pxe-virtio.rom
+-rw-r--r--	root/root	usr/share/qemu/q35-acpi-dsdt.aml
+-rw-r--r--	root/root	usr/share/qemu/qemu-icon.bmp
+-rw-r--r--	root/root	usr/share/qemu/s390-zipl.rom
+-rw-r--r--	root/root	usr/share/qemu/sgabios.bin
+-rw-r--r--	root/root	usr/share/qemu/slof.bin
+-rw-r--r--	root/root	usr/share/qemu/spapr-rtas.bin
+-rw-r--r--	root/root	usr/share/qemu/vgabios-cirrus.bin
+-rw-r--r--	root/root	usr/share/qemu/vgabios-qxl.bin
+-rw-r--r--	root/root	usr/share/qemu/vgabios-stdvga.bin
+-rw-r--r--	root/root	usr/share/qemu/vgabios-vmware.bin
+-rw-r--r--	root/root	usr/share/qemu/vgabios.bin
diff --git a/qemu-all/.md5sum b/qemu-all/.md5sum
new file mode 100644
index 0000000..91a1a37
--- /dev/null
+++ b/qemu-all/.md5sum
@@ -0,0 +1 @@
+78f13b774814b6b7ebcaf4f9b9204318  qemu-1.4.0.tar.bz2
diff --git a/qemu-all/Pkgfile b/qemu-all/Pkgfile
new file mode 100644
index 0000000..09a5d78
--- /dev/null
+++ b/qemu-all/Pkgfile
@@ -0,0 +1,31 @@
+# Description: Fast CPU emulator and virtualizer for all supported platforms
+# URL:         http://www.qemu.org
+# Maintainer:  Thomas Penteker, tek at serverop dot de
+# Packager:    Lucas Hazel, lucas at die dot net dot au
+# Depends on:  libsdl
+# Nice to have: libseccomp libiscsi 
+ 
+name=qemu-all
+version=1.4.0
+release=1
+source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2)
+
+build() {
+  cd qemu-$version
+  ./configure --prefix=/usr \
+      --cc="${CC:=gcc}" \
+      --host-cc="${CC:=gcc}" \
+      --sysconfdir=/etc \
+      --disable-docs \
+      --libexecdir=/usr/lib/qemu
+
+  # fix include issues with nspr
+  echo 'QEMU_CFLAGS+=-I/usr/include/nspr' >> libcacard/Makefile
+  make ${MAKEFLAGS:=}
+  make DESTDIR=$PKG install
+
+  make qemu.1 qemu-img.1 qemu-nbd.8
+  install -D -m 644 qemu.1 $PKG/usr/man/man1/qemu.1
+  install -D -m 644 qemu-img.1 $PKG/usr/man/man1/qemu-img.1
+  install -D -m 644 qemu-nbd.8 $PKG/usr/man/man8/qemu-nbd.8
+}
diff --git a/qemu/.footprint b/qemu/.footprint
index 10fbcbf..35b1bed 100644
--- a/qemu/.footprint
+++ b/qemu/.footprint
@@ -3,60 +3,18 @@ drwxr-xr-x	root/root	etc/qemu/
 -rw-r--r--	root/root	etc/qemu/target-x86_64.conf (EMPTY)
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/qemu-alpha
--rwxr-xr-x	root/root	usr/bin/qemu-arm
--rwxr-xr-x	root/root	usr/bin/qemu-armeb
--rwxr-xr-x	root/root	usr/bin/qemu-cris
 -rwxr-xr-x	root/root	usr/bin/qemu-ga
 -rwxr-xr-x	root/root	usr/bin/qemu-i386
 -rwxr-xr-x	root/root	usr/bin/qemu-img
 -rwxr-xr-x	root/root	usr/bin/qemu-io
--rwxr-xr-x	root/root	usr/bin/qemu-m68k
--rwxr-xr-x	root/root	usr/bin/qemu-microblaze
--rwxr-xr-x	root/root	usr/bin/qemu-microblazeel
--rwxr-xr-x	root/root	usr/bin/qemu-mips
--rwxr-xr-x	root/root	usr/bin/qemu-mipsel
 -rwxr-xr-x	root/root	usr/bin/qemu-nbd
--rwxr-xr-x	root/root	usr/bin/qemu-or32
--rwxr-xr-x	root/root	usr/bin/qemu-ppc
--rwxr-xr-x	root/root	usr/bin/qemu-ppc64
--rwxr-xr-x	root/root	usr/bin/qemu-ppc64abi32
--rwxr-xr-x	root/root	usr/bin/qemu-s390x
--rwxr-xr-x	root/root	usr/bin/qemu-sh4
--rwxr-xr-x	root/root	usr/bin/qemu-sh4eb
--rwxr-xr-x	root/root	usr/bin/qemu-sparc
--rwxr-xr-x	root/root	usr/bin/qemu-sparc32plus
--rwxr-xr-x	root/root	usr/bin/qemu-sparc64
--rwxr-xr-x	root/root	usr/bin/qemu-system-alpha
--rwxr-xr-x	root/root	usr/bin/qemu-system-arm
--rwxr-xr-x	root/root	usr/bin/qemu-system-cris
 -rwxr-xr-x	root/root	usr/bin/qemu-system-i386
--rwxr-xr-x	root/root	usr/bin/qemu-system-lm32
--rwxr-xr-x	root/root	usr/bin/qemu-system-m68k
--rwxr-xr-x	root/root	usr/bin/qemu-system-microblaze
--rwxr-xr-x	root/root	usr/bin/qemu-system-microblazeel
--rwxr-xr-x	root/root	usr/bin/qemu-system-mips
--rwxr-xr-x	root/root	usr/bin/qemu-system-mips64
--rwxr-xr-x	root/root	usr/bin/qemu-system-mips64el
--rwxr-xr-x	root/root	usr/bin/qemu-system-mipsel
--rwxr-xr-x	root/root	usr/bin/qemu-system-or32
--rwxr-xr-x	root/root	usr/bin/qemu-system-ppc
--rwxr-xr-x	root/root	usr/bin/qemu-system-ppc64
--rwxr-xr-x	root/root	usr/bin/qemu-system-ppcemb
--rwxr-xr-x	root/root	usr/bin/qemu-system-s390x
--rwxr-xr-x	root/root	usr/bin/qemu-system-sh4
--rwxr-xr-x	root/root	usr/bin/qemu-system-sh4eb
--rwxr-xr-x	root/root	usr/bin/qemu-system-sparc
--rwxr-xr-x	root/root	usr/bin/qemu-system-sparc64
--rwxr-xr-x	root/root	usr/bin/qemu-system-unicore32
 -rwxr-xr-x	root/root	usr/bin/qemu-system-x86_64
--rwxr-xr-x	root/root	usr/bin/qemu-system-xtensa
--rwxr-xr-x	root/root	usr/bin/qemu-system-xtensaeb
--rwxr-xr-x	root/root	usr/bin/qemu-unicore32
 -rwxr-xr-x	root/root	usr/bin/qemu-x86_64
 -rwxr-xr-x	root/root	usr/bin/virtfs-proxy-helper
-drwxr-xr-x	root/root	usr/libexec/
--rwxr-xr-x	root/root	usr/libexec/qemu-bridge-helper
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/qemu/
+-rwxr-xr-x	root/root	usr/lib/qemu/qemu-bridge-helper
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/qemu-img.1.gz
diff --git a/qemu/Pkgfile b/qemu/Pkgfile
index 00b3e96..4a10557 100644
--- a/qemu/Pkgfile
+++ b/qemu/Pkgfile
@@ -1,12 +1,13 @@
-# Description: Fast CPU emulator and virtualizer
+# Description: Fast CPU emulator and virtualizer for the x86 platform
 # URL:         http://www.qemu.org
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager:    Lucas Hazel, lucas at die dot net dot au
 # Depends on:  libsdl
-
+# Nice to have: libseccomp libiscsi 
+ 
 name=qemu
 version=1.4.0
-release=1
+release=2
 source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2)
 
 build() {
@@ -15,7 +16,11 @@ build() {
       --cc="${CC:=gcc}" \
       --host-cc="${CC:=gcc}" \
       --sysconfdir=/etc \
-      --disable-docs
+      --disable-docs \
+      --libexecdir=/usr/lib/qemu \
+      --disable-system \
+      --disable-user \
+      --target-list=x86_64-linux-user,i386-linux-user,i386-softmmu,x86_64-softmmu
 
   # fix include issues with nspr
   echo 'QEMU_CFLAGS+=-I/usr/include/nspr' >> libcacard/Makefile



More information about the CRUX mailing list