sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update qemu-sbruno/qemu-static-user to track upstream development.

Browse source 
Change the way qemu-user-static builds with relationship to glib20 (ian@)

Update a couple of patches for changes to include file locations.
This commit is contained in:
Sean Bruno 2016-07-12 15:17:44 +00:00
parent 4a07d60969
commit 30cb462b0d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=418427
5 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
emulators/qemu-sbruno/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qemu
PORTVERSION= 2.6.50.g20160628
PORTVERSION= 2.6.50.g20160711
CATEGORIES= emulators
MASTER_SITES= GH \
LOCAL/nox:dtc \
@ -18,11 +18,10 @@ COMMENT?= QEMU CPU Emulator - github bsd-user branch
USE_GITHUB= yes
GH_ACCOUNT= seanbruno
GH_PROJECT= ${PORTNAME}-bsd-user
GH_TAGNAME= 4c46f61
GH_TAGNAME= c94de16
HAS_CONFIGURE= yes
USES= gmake pkgconfig bison perl5 python:2,build
USE_PERL5= build
USE_GNOME+= glib20
PATCH_STRIP= -p1
MAKE_ENV+= BSD_MAKE="${MAKE}"
ONLY_FOR_ARCHS= amd64 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts?
@ -56,6 +55,14 @@ CONFIGURE_ARGS+= --disable-tools
.endif
.endif
# When static linking we have a build dependency on libglib-2.0.a, otherwise
# we use glib20 in the usual way (shared-lib runtime dependency).
.if defined(QEMU_USER_STATIC)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libglib-2.0.a:devel/glib20
.else
USE_GNOME+= glib20
.endif
.include <bsd.port.options.mk>
CONFIGURE_ARGS+= --localstatedir=/var

6
emulators/qemu-sbruno/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (qemu/2.6.50.g20160628/seanbruno-qemu-bsd-user-2.6.50.g20160628-4c46f61_GH0.tar.gz) = 698c0bd95b8cd24d68fe60b3c62295f942073ed1ffacbb5e699cb5bbffef95a1
SIZE (qemu/2.6.50.g20160628/seanbruno-qemu-bsd-user-2.6.50.g20160628-4c46f61_GH0.tar.gz) = 12124250
SHA256 (qemu/2.6.50.g20160628/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
SHA256 (qemu/2.6.50.g20160711/seanbruno-qemu-bsd-user-2.6.50.g20160711-c94de16_GH0.tar.gz) = 6108989a13a0958eee5bc61eace8408ce6b86cccc4d29c9f272447dec13d6790
SIZE (qemu/2.6.50.g20160711/seanbruno-qemu-bsd-user-2.6.50.g20160711-c94de16_GH0.tar.gz) = 12867346
SHA256 (qemu/2.6.50.g20160711/dtc-v1.4.0.tar.gz) = 39d0713efd82a27adc065ecb9ef36401c53d5ee87ae1764e2bb243fcd97488e3
SIZE (qemu/2.6.50.g201605/dtc-v1.4.0.tar.gz) = 131893

2
emulators/qemu-sbruno/files/cdrom-dma-patch
View file

@ -1,4 +1,4 @@
Index: hw/ide/internal.h
Index: include/hw/ide/internal.h
@@ -27,7 +27,7 @@
//#define DEBUG_IDE
//#define DEBUG_IDE_ATAPI

12
emulators/qemu-sbruno/files/patch-Makefile
View file

@ -1,6 +1,6 @@
--- Makefile.orig 2015-10-11 14:24:23.000000000 -0700
+++ Makefile 2015-10-11 14:52:24.499336000 -0700
@@ -88,8 +88,12 @@
--- Makefile.orig 2016-07-11 15:33:10 UTC
+++ Makefile
@@ -91,8 +91,12 @@ LIBS+=-lz $(LIBS_TOOLS)
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
ifdef BUILD_DOCS
@ -10,10 +10,10 @@
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
DOCS+=qmp-commands.txt
+endif
ifdef CONFIG_LINUX
DOCS+=kvm_stat.1
ifdef CONFIG_VIRTFS
DOCS+=fsdev/virtfs-proxy-helper.1
endif
@@ -390,8 +394,10 @@
@@ -430,8 +434,10 @@ endif
install-doc: $(DOCS)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"

1
emulators/qemu-sbruno/pkg-plist
View file

@ -91,7 +91,6 @@
%%SOFTMMU%%%%DATADIR%%/kvmvapic.bin
%%SOFTMMU%%%%DATADIR%%/qemu-icon.bmp
%%SOFTMMU%%%%DATADIR%%/qemu_logo_no_text.svg
%%SOFTMMU%%%%DATADIR%%/trace-events
%%SOFTMMU%%%%DATADIR%%/keymaps/ar
%%SOFTMMU%%%%DATADIR%%/keymaps/bepo
%%SOFTMMU%%%%DATADIR%%/keymaps/common