# HG changeset patch # User Jon Tibble # Date 1341068910 -3600 # Node ID 262da12dfebf741aa1bfb91f3d37c35db3b75f79 # Parent 98c3480fbe2844e6605525a5ebb00162e3966e24 Bump qemu-kvm diff -r 98c3480fbe28 -r 262da12dfebf components/qemu-kvm/Makefile --- a/components/qemu-kvm/Makefile Sat Jun 30 15:08:23 2012 +0100 +++ b/components/qemu-kvm/Makefile Sat Jun 30 16:08:30 2012 +0100 @@ -18,10 +18,11 @@ PATH= /usr/gnu/bin:/usr/bin COMPONENT_NAME= illumos-kvm-cmd -COMPONENT_VERSION= 4f48eea -IPS_COMPONENT_VERSION= 0.0.1.20120229 +COMPONENT_VERSION= df8e478 +IPS_COMPONENT_VERSION= 0.0.1.20120622 COMPONENT_SRC= joyent-illumos-kvm-cmd-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:b7088eb7afdd1079ce35988383be129c2572baaa COMPONENT_ARCHIVE_URL= https://nodeload.github.com/joyent/illumos-kvm-cmd/tarball/$(COMPONENT_VERSION) ifeq ($(MACH), sparc) @@ -41,6 +42,9 @@ CONFIGURE_ENV += PATH=$(PATH):/usr/sbin +CONFIGURE_OPTIONS = --prefix=/usr +CONFIGURE_OPTIONS += --mandir=/usr/share/man +CONFIGURE_OPTIONS += --bindir=/usr/bin/amd64 CONFIGURE_OPTIONS += --sysconfdir=/etc CONFIGURE_OPTIONS += --enable-kvm CONFIGURE_OPTIONS += --enable-kvm-pit diff -r 98c3480fbe28 -r 262da12dfebf components/qemu-kvm/qemu-kvm.p5m --- a/components/qemu-kvm/qemu-kvm.p5m Sat Jun 30 15:08:23 2012 +0100 +++ b/components/qemu-kvm/qemu-kvm.p5m Sat Jun 30 16:08:30 2012 +0100 @@ -11,36 +11,89 @@ # # Copyright 2011 EveryCity Ltd. All rights reserved. +# Copyright 2012, Jon Tibble # 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" -set name=info.upstream_url value=http://qemu.org/ -set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +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) +set name=variant.arch value=$(MACH) license LICENSE license="QEMU-KVM license" 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=usr -dir path=usr/bin -dir path=usr/bin/$(MACH64) -dir path=usr/share -dir path=usr/share/qemu -dir path=usr/share/qemu/keymaps -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 +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 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 -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 +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