# HG changeset patch # User Jon Tibble # Date 1346695825 -3600 # Node ID 3d3a654f57d0da2bf3e55db73a557233da1025ff # Parent b88ea635ba51f4cefd23eb27dfeb8c7a1444e2c5 Bump qemu-kvm and remove qemu diff -r b88ea635ba51 -r 3d3a654f57d0 .hgignore --- a/.hgignore Mon Sep 03 19:05:07 2012 +0100 +++ b/.hgignore Mon Sep 03 19:10:25 2012 +0100 @@ -15,7 +15,7 @@ components/python/ply/ply-3.1* components/python/pybonjour/pybonjour-1.1.1* components/python/pycurl/pycurl-7.19.0* -components/qemu-kvm/joyent-illumos-kvm-cmd-df8e478* +components/qemu-kvm/joyent-illumos-kvm-cmd-bacaa89* i386* tools/python/pkglint/__init__.pyc tools/python/pkglint/userland.pyc diff -r b88ea635ba51 -r 3d3a654f57d0 components/meta-packages/history/qemu.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/meta-packages/history/qemu.p5m Mon Sep 03 19:10:25 2012 +0100 @@ -0,0 +1,17 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2011 EveryCity Ltd. All rights reserved. +# + +set name=pkg.fmri value=pkg:/system/qemu@0.15.0,5.11-0.151.1.5 +set name=pkg.obsolete value=true diff -r b88ea635ba51 -r 3d3a654f57d0 components/qemu-kvm/Makefile --- a/components/qemu-kvm/Makefile Mon Sep 03 19:05:07 2012 +0100 +++ b/components/qemu-kvm/Makefile Mon Sep 03 19:10:25 2012 +0100 @@ -16,13 +16,13 @@ include ../../make-rules/shared-macros.mk -PATH= /usr/gnu/bin:/usr/bin +PATH= /opt/onbld/bin/i386:/usr/bin:/usr/sbin:/sbin:/usr/gnu/bin COMPONENT_NAME= illumos-kvm-cmd -COMPONENT_VERSION= df8e478 -IPS_COMPONENT_VERSION= 0.0.1.20120622 +COMPONENT_VERSION= bacaa89 +IPS_COMPONENT_VERSION= 0.0.1.20120807 COMPONENT_SRC= joyent-illumos-kvm-cmd-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_HASH= sha1:b7088eb7afdd1079ce35988383be129c2572baaa +COMPONENT_ARCHIVE_HASH= sha256:7796b0905f532b60fdfc1bdfeba9dbfcf776d23cc04e2ee71188b488f4b4c15a COMPONENT_ARCHIVE_URL= https://nodeload.github.com/joyent/illumos-kvm-cmd/tarball/$(COMPONENT_VERSION) ifeq ($(MACH), sparc) @@ -33,6 +33,8 @@ include ../../make-rules/configure.mk include ../../make-rules/ips.mk +CC=/opt/gcc/4.4.4/bin/gcc + COMPONENT_PREP_ACTION = \ ($(MKDIR) $(SOURCE_DIR)/kvm/include/sys; \ $(LN) $(COMPONENT_DIR)/illumos-kvm/*.h $(SOURCE_DIR)/kvm/include/sys; ) @@ -42,7 +44,10 @@ CONFIGURE_ENV += PATH=$(PATH):/usr/sbin -CONFIGURE_OPTIONS = --prefix=/usr +CONFIGURE_OPTIONS = --cc=$(CC) +CONFIGURE_OPTIONS += --extra-cflags="-fno-builtin -fno-stack-protector" +CONFIGURE_OPTIONS += --extra-ldflags="-nodefaultlibs -lz -lm -lc" +CONFIGURE_OPTIONS += --prefix=/usr CONFIGURE_OPTIONS += --mandir=/usr/share/man CONFIGURE_OPTIONS += --bindir=/usr/bin/amd64 CONFIGURE_OPTIONS += --sysconfdir=/etc @@ -52,6 +57,7 @@ CONFIGURE_OPTIONS += --disable-kvm-device-assignment CONFIGURE_OPTIONS += --enable-trace-backend=dtrace CONFIGURE_OPTIONS += --target-list="i386-softmmu x86_64-softmmu" +CONFIGURE_OPTIONS += --enable-debug COMPONENT_BUILD_ENV += PATH=$(PATH):/usr/sbin diff -r b88ea635ba51 -r 3d3a654f57d0 components/qemu-kvm/qemu-kvm.p5m --- a/components/qemu-kvm/qemu-kvm.p5m Mon Sep 03 19:05:07 2012 +0100 +++ b/components/qemu-kvm/qemu-kvm.p5m Mon Sep 03 19:10:25 2012 +0100 @@ -14,6 +14,9 @@ # Copyright 2012, Jon Tibble # + default mangler.man.stability uncommitted> + default preserve true> + set name=pkg.fmri value=pkg:/system/qemu/kvm@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="QEMU-KVM - generic machine emulator and virtualizer" set name=info.classification value="org.opensolaris.category.2008:System/Virtualization" @@ -26,22 +29,78 @@ license COPYING license="GPLv2" license COPYING.LIB license="LGPLv2.1" -depend fmri=pkg:/system/qemu type=require pkg.linted=true -depend fmri=pkg:/driver/i86pc/kvm type=require pkg.linted=true - +dir path=etc +dir path=etc/qemu +file path=etc/qemu/target-x86_64.conf dir path=usr dir path=usr/bin dir path=usr/bin/$(MACH64) file usr/bin/$(MACH64)/qemu path=usr/bin/$(MACH64)/qemu-kvm-system-i386 file usr/bin/$(MACH64)/qemu-system-x86_64 path=usr/bin/$(MACH64)/qemu-kvm-system-x86_64 +file path=usr/bin/$(MACH64)/qemu +file path=usr/bin/$(MACH64)/qemu-img +file path=usr/bin/$(MACH64)/qemu-io +file path=usr/bin/$(MACH64)/qemu-nbd +file path=usr/bin/$(MACH64)/qemu-system-x86_64 dir path=usr/share dir path=usr/share/qemu +file path=usr/share/qemu/bamboo.dtb +file path=usr/share/qemu/bios.bin file path=usr/share/qemu/gpxe-eepro100-80861209.rom -link path=usr/share/qemu/pxe-e1000.bin target=pxe-e1000.rom pkg.linted=true -link path=usr/share/qemu/pxe-ne2k_pci.bin target=pxe-ne2k_pci.rom pkg.linted=true -link path=usr/share/qemu/pxe-pcnet.bin target=pxe-pcnet.rom pkg.linted=true -link path=usr/share/qemu/pxe-rtl8139.bin target=pxe-rtl8139.rom pkg.linted=true -link path=usr/share/qemu/pxe-virtio.bin target=pxe-virtio.rom pkg.linted=true +dir path=usr/share/qemu/keymaps +file path=usr/share/qemu/keymaps/ar +file path=usr/share/qemu/keymaps/common +file path=usr/share/qemu/keymaps/da +file path=usr/share/qemu/keymaps/de +file path=usr/share/qemu/keymaps/de-ch +file path=usr/share/qemu/keymaps/en-gb +file path=usr/share/qemu/keymaps/en-us +file path=usr/share/qemu/keymaps/es +file path=usr/share/qemu/keymaps/et +file path=usr/share/qemu/keymaps/fi +file path=usr/share/qemu/keymaps/fo +file path=usr/share/qemu/keymaps/fr +file path=usr/share/qemu/keymaps/fr-be +file path=usr/share/qemu/keymaps/fr-ca +file path=usr/share/qemu/keymaps/fr-ch +file path=usr/share/qemu/keymaps/hr +file path=usr/share/qemu/keymaps/hu +file path=usr/share/qemu/keymaps/is +file path=usr/share/qemu/keymaps/it +file path=usr/share/qemu/keymaps/ja +file path=usr/share/qemu/keymaps/lt +file path=usr/share/qemu/keymaps/lv +file path=usr/share/qemu/keymaps/mk +file path=usr/share/qemu/keymaps/modifiers +file path=usr/share/qemu/keymaps/nl +file path=usr/share/qemu/keymaps/nl-be +file path=usr/share/qemu/keymaps/no +file path=usr/share/qemu/keymaps/pl +file path=usr/share/qemu/keymaps/pt +file path=usr/share/qemu/keymaps/pt-br +file path=usr/share/qemu/keymaps/ru +file path=usr/share/qemu/keymaps/sl +file path=usr/share/qemu/keymaps/sv +file path=usr/share/qemu/keymaps/th +file path=usr/share/qemu/keymaps/tr +file path=usr/share/qemu/linuxboot.bin +file path=usr/share/qemu/multiboot.bin +file path=usr/share/qemu/openbios-ppc +file path=usr/share/qemu/openbios-sparc32 +file path=usr/share/qemu/openbios-sparc64 pkg.linted=true +file path=usr/share/qemu/petalogix-s3adsp1800.dtb +file path=usr/share/qemu/ppc_rom.bin +file path=usr/share/qemu/pxe-e1000.bin +file path=usr/share/qemu/pxe-ne2k_pci.bin +file path=usr/share/qemu/pxe-pcnet.bin +file path=usr/share/qemu/pxe-rtl8139.bin +file path=usr/share/qemu/pxe-virtio.bin +file path=usr/share/qemu/s390-zipl.rom file path=usr/share/qemu/vapic.bin +file path=usr/share/qemu/vgabios-cirrus.bin +file path=usr/share/qemu/vgabios-qxl.bin +file path=usr/share/qemu/vgabios-stdvga.bin +file path=usr/share/qemu/vgabios-vmware.bin +file path=usr/share/qemu/vgabios.bin link path=usr/bin/$(MACH64)/qemu-kvm target=qemu-kvm-system-x86_64 link path=usr/bin/qemu-kvm target=$(MACH64)/qemu-kvm-system-x86_64 diff -r b88ea635ba51 -r 3d3a654f57d0 components/qemu/Makefile --- a/components/qemu/Makefile Mon Sep 03 19:05:07 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011 Andrzej Szeszo -# Copyright 2011 Alasdair Lumsden -# Copyright 2012, Piotr Jasiukajtis -# - -include ../../make-rules/shared-macros.mk - -PATH= /usr/gnu/bin:/usr/bin -COMPONENT_NAME= qemu -COMPONENT_VERSION= 0.15.0 -COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_URL= http://wiki.qemu.org/download/$(COMPONENT_ARCHIVE) - -ifeq ($(MACH), sparc) -PUBLISH_STAMP= -endif - -include ../../make-rules/prep.mk -include ../../make-rules/configure.mk -include ../../make-rules/ips.mk - -# Documentation requires pod2man -CONFIGURE_ENV += PATH=$(PATH):/usr/perl5/5.10.0/bin -COMPONENT_BUILD_ENV += PATH=$(PATH):/usr/perl5/5.10.0/bin - -COMPONENT_PRE_CONFIGURE_ACTION = \ - $(CLONEY) $(SOURCE_DIR) $(@D) - -CONFIGURE_OPTIONS = --prefix=/usr -CONFIGURE_OPTIONS += --mandir=/usr/share/man -CONFIGURE_OPTIONS.32 += --bindir=/usr/bin -CONFIGURE_OPTIONS.64 += --bindir=/usr/bin/$(MACH64) -CONFIGURE_OPTIONS.32 += --libdir=/usr/lib -CONFIGURE_OPTIONS.64 += --libdir=/usr/lib/$(MACH64) -CONFIGURE_OPTIONS += --sysconfdir=/etc -CONFIGURE_OPTIONS += --enable-vnc-png -CONFIGURE_OPTIONS += --enable-docs - -CONFIGURE_OPTIONS.32 += --cpu=i386 -CONFIGURE_OPTIONS.64 += --cpu=x86_64 - -CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.$(BITS)) - -build_sparc: - @echo "Not available." - -build_i386: $(BUILD_32_and_64) - -build: build_$(MACH) - -install_sparc: - @echo "Not available." - -install_i386: $(INSTALL_32_and_64) - -install: install_$(MACH) diff -r b88ea635ba51 -r 3d3a654f57d0 components/qemu/patches/configure.patch --- a/components/qemu/patches/configure.patch Mon Sep 03 19:05:07 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -diff -ruN joyent-illumos-kvm-cmd-8fa43e8.orig/configure joyent-illumos-kvm-cmd-8fa43e8/configure ---- joyent-illumos-kvm-cmd-8fa43e8.orig/configure 2011-08-13 18:37:55.000000000 +0100 -+++ joyent-illumos-kvm-cmd-8fa43e8/configure 2011-08-19 15:30:39.495506247 +0100 -@@ -420,12 +420,6 @@ - ld="gld" - needs_libsunmath="no" - solarisrev=`uname -r | cut -f2 -d.` -- # have to select again, because `uname -m` returns i86pc -- # even on an x86_64 box. -- solariscpu=`isainfo -k` -- if test "${solariscpu}" = "amd64" ; then -- cpu="x86_64" -- fi - if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then - if test "$solarisrev" -le 9 ; then - if test -f /opt/SUNWspro/prod/lib/libsunmath.so.1; then -@@ -755,7 +749,7 @@ - ;; - --enable-sunos-vnic) sunos_vnic="yes" - ;; -- *) echo "ERROR: unknown option $opt"; show_help="yes" -+ *) echo "ERROR: unknown option $opt" - ;; - esac - done diff -r b88ea635ba51 -r 3d3a654f57d0 components/qemu/patches/ossaudio.patch --- a/components/qemu/patches/ossaudio.patch Mon Sep 03 19:05:07 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -diff --git a/audio/ossaudio.c b/audio/ossaudio.c -index b49e102..724f696 100644 ---- a/audio/ossaudio.c -+++ b/audio/ossaudio.c -@@ -315,10 +315,12 @@ static int oss_open (int in, struct oss_params *req, - goto err; - } - -+#ifndef CONFIG_SOLARIS - if (ioctl (fd, SNDCTL_DSP_NONBLOCK, NULL)) { - oss_logerr2 (errno, typ, "Failed to set non-blocking mode\n"); - goto err; - } -+#endif - - #ifdef USE_DSP_POLICY - if (conf.policy >= 0) { - diff -r b88ea635ba51 -r 3d3a654f57d0 components/qemu/patches/qemu-ga.patch --- a/components/qemu/patches/qemu-ga.patch Mon Sep 03 19:05:07 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -ruN qemu-0.15.0.orig/qemu-ga.c qemu-0.15.0/qemu-ga.c ---- qemu-0.15.0.orig/qemu-ga.c 2011-08-08 19:28:42.000000000 +0100 -+++ qemu-0.15.0/qemu-ga.c 2011-08-19 15:56:27.785557138 +0100 -@@ -490,7 +490,7 @@ - - if (strcmp(s->method, "virtio-serial") == 0) { - s->virtio = true; -- fd = qemu_open(s->path, O_RDWR | O_NONBLOCK | O_ASYNC); -+ fd = qemu_open(s->path, O_RDWR | O_NONBLOCK ); - if (fd == -1) { - g_critical("error opening channel: %s", strerror(errno)); - exit(EXIT_FAILURE); diff -r b88ea635ba51 -r 3d3a654f57d0 components/qemu/qemu.p5m --- a/components/qemu/qemu.p5m Mon Sep 03 19:05:07 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,154 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2011 EveryCity Ltd. All rights reserved. -# - - default mangler.man.stability uncommitted> - default preserve true> - -set name=pkg.fmri value=pkg:/system/qemu@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.summary value="QEMU - generic machine emulator and virtualizer" -set name=info.classification value="org.opensolaris.category.2008:System/Virtualization" -set name=info.upstream_url value=http://qemu.org/ -set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) -set name=org.opensolaris.consolidation value=$(CONSOLIDATION) - -license LICENSE license="QEMU license" -license COPYING license="GPLv2" -license COPYING.LIB license="LGPLv2.1" - -dir path=etc -dir path=etc/qemu -dir path=usr -dir path=usr/bin -dir path=usr/bin/$(MACH64) -dir path=usr/share -dir path=usr/share/doc -dir path=usr/share/doc/qemu -dir path=usr/share/man -dir path=usr/share/man/man1 -dir path=usr/share/man/man8 -dir path=usr/share/qemu -dir path=usr/share/qemu/keymaps -file path=etc/qemu/target-x86_64.conf -file path=usr/bin/$(MACH64)/qemu -file path=usr/bin/$(MACH64)/qemu-system-arm -file path=usr/bin/$(MACH64)/qemu-system-cris -file path=usr/bin/$(MACH64)/qemu-system-lm32 pkg.depend.bypass-generate=.* -file path=usr/bin/$(MACH64)/qemu-system-m68k -file path=usr/bin/$(MACH64)/qemu-system-microblaze -file path=usr/bin/$(MACH64)/qemu-system-microblazeel -file path=usr/bin/$(MACH64)/qemu-system-mips -file path=usr/bin/$(MACH64)/qemu-system-mips64 -file path=usr/bin/$(MACH64)/qemu-system-mips64el -file path=usr/bin/$(MACH64)/qemu-system-mipsel -file path=usr/bin/$(MACH64)/qemu-system-ppc -file path=usr/bin/$(MACH64)/qemu-system-ppc64 -file path=usr/bin/$(MACH64)/qemu-system-ppcemb -file path=usr/bin/$(MACH64)/qemu-system-s390x -file path=usr/bin/$(MACH64)/qemu-system-sh4 -file path=usr/bin/$(MACH64)/qemu-system-sh4eb -file path=usr/bin/$(MACH64)/qemu-system-sparc -file path=usr/bin/$(MACH64)/qemu-system-sparc64 -file path=usr/bin/$(MACH64)/qemu-system-x86_64 -file path=usr/bin/qemu -file path=usr/bin/qemu-ga -file path=usr/bin/qemu-img -file path=usr/bin/qemu-io -file path=usr/bin/qemu-nbd -file path=usr/bin/qemu-system-arm -file path=usr/bin/qemu-system-cris -file path=usr/bin/qemu-system-lm32 pkg.depend.bypass-generate=.* -file path=usr/bin/qemu-system-m68k -file path=usr/bin/qemu-system-microblaze -file path=usr/bin/qemu-system-microblazeel -file path=usr/bin/qemu-system-mips -file path=usr/bin/qemu-system-mips64 -file path=usr/bin/qemu-system-mips64el -file path=usr/bin/qemu-system-mipsel -file path=usr/bin/qemu-system-ppc -file path=usr/bin/qemu-system-ppc64 -file path=usr/bin/qemu-system-ppcemb -file path=usr/bin/qemu-system-s390x -file path=usr/bin/qemu-system-sh4 -file path=usr/bin/qemu-system-sh4eb -file path=usr/bin/qemu-system-sparc -file path=usr/bin/qemu-system-sparc64 -file path=usr/bin/qemu-system-x86_64 -file path=usr/share/doc/qemu/qemu-doc.html -file path=usr/share/doc/qemu/qemu-tech.html -file path=usr/share/man/man1/qemu-img.1 -file path=usr/share/man/man1/qemu.1 -file path=usr/share/man/man8/qemu-nbd.8 -file path=usr/share/qemu/bamboo.dtb -file path=usr/share/qemu/bios.bin -file path=usr/share/qemu/keymaps/ar -file path=usr/share/qemu/keymaps/common -file path=usr/share/qemu/keymaps/da -file path=usr/share/qemu/keymaps/de -file path=usr/share/qemu/keymaps/de-ch -file path=usr/share/qemu/keymaps/en-gb -file path=usr/share/qemu/keymaps/en-us -file path=usr/share/qemu/keymaps/es -file path=usr/share/qemu/keymaps/et -file path=usr/share/qemu/keymaps/fi -file path=usr/share/qemu/keymaps/fo -file path=usr/share/qemu/keymaps/fr -file path=usr/share/qemu/keymaps/fr-be -file path=usr/share/qemu/keymaps/fr-ca -file path=usr/share/qemu/keymaps/fr-ch -file path=usr/share/qemu/keymaps/hr -file path=usr/share/qemu/keymaps/hu -file path=usr/share/qemu/keymaps/is -file path=usr/share/qemu/keymaps/it -file path=usr/share/qemu/keymaps/ja -file path=usr/share/qemu/keymaps/lt -file path=usr/share/qemu/keymaps/lv -file path=usr/share/qemu/keymaps/mk -file path=usr/share/qemu/keymaps/modifiers -file path=usr/share/qemu/keymaps/nl -file path=usr/share/qemu/keymaps/nl-be -file path=usr/share/qemu/keymaps/no -file path=usr/share/qemu/keymaps/pl -file path=usr/share/qemu/keymaps/pt -file path=usr/share/qemu/keymaps/pt-br -file path=usr/share/qemu/keymaps/ru -file path=usr/share/qemu/keymaps/sl -file path=usr/share/qemu/keymaps/sv -file path=usr/share/qemu/keymaps/th -file path=usr/share/qemu/keymaps/tr -file path=usr/share/qemu/linuxboot.bin -file path=usr/share/qemu/mpc8544ds.dtb -file path=usr/share/qemu/multiboot.bin -file path=usr/share/qemu/openbios-ppc -file path=usr/share/qemu/openbios-sparc32 -file path=usr/share/qemu/openbios-sparc64 pkg.linted=true -file path=usr/share/qemu/petalogix-ml605.dtb -file path=usr/share/qemu/petalogix-s3adsp1800.dtb -file path=usr/share/qemu/ppc_rom.bin -file path=usr/share/qemu/pxe-e1000.rom -file path=usr/share/qemu/pxe-eepro100.rom -file path=usr/share/qemu/pxe-ne2k_pci.rom -file path=usr/share/qemu/pxe-pcnet.rom -file path=usr/share/qemu/pxe-rtl8139.rom -file path=usr/share/qemu/pxe-virtio.rom -file path=usr/share/qemu/s390-zipl.rom -file path=usr/share/qemu/slof.bin -file path=usr/share/qemu/spapr-rtas.bin -file path=usr/share/qemu/vgabios-cirrus.bin -file path=usr/share/qemu/vgabios-qxl.bin -file path=usr/share/qemu/vgabios-stdvga.bin -file path=usr/share/qemu/vgabios-vmware.bin -file path=usr/share/qemu/vgabios.bin -link path=usr/bin/$(MACH64)/qemu-system-i386 target=qemu -link path=usr/bin/qemu-system-i386 target=qemu