Install qemu-ifup properly. Makes network functional in HVM guests.

5 files changed, 12 insertions, 14 deletions

diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile
index f88a8c35eca..05835308d8d 100644
--- a/sysutils/xentools33/Makefile
+++ b/sysutils/xentools33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/15 13:05:10 cegger Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/15 14:06:54 cegger Exp $
 #
 
 VERSION=		3.3-18331
@@ -132,7 +132,7 @@ FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 BLKTAP_FILES=		blk_netbsd.c blktapctrl_netbsd.c
 
-XEND_SCRIPTS=		block vif-bridge vif-ip
+XEND_SCRIPTS=		block vif-bridge vif-ip qemu-ifup
 
 CONF_FILES=		${EGDIR}/xend-config.sxp \
 			${PKG_SYSCONFDIR}/xend-config.sxp
diff --git a/sysutils/xentools33/PLIST b/sysutils/xentools33/PLIST
index 4ba636057b9..686cc72814b 100644
--- a/sysutils/xentools33/PLIST
+++ b/sysutils/xentools33/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/08/07 20:26:57 cegger Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/08/15 14:06:54 cegger Exp $
 bin/lsevtchn
 bin/pygrub
 bin/readnotes
@@ -21,7 +21,6 @@ bin/xenstore-write
 bin/xentrace
 bin/xentrace_format
 bin/xentrace_setsize
-etc/xen/qemu-ifup
 include/blktaplib.h
 include/flask.h
 include/fsimage.h
diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo
index 85a9acd838b..e1ed942413c 100644
--- a/sysutils/xentools33/distinfo
+++ b/sysutils/xentools33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2008/08/15 13:05:10 cegger Exp $
+$NetBSD: distinfo,v 1.5 2008/08/15 14:06:54 cegger Exp $
 
 SHA1 (xen-3.3-18331.tar.gz) = ba2e960f08fbf0ad2b91cc8330d3487c5967cfef
 RMD160 (xen-3.3-18331.tar.gz) = 8a520701fd96cabfb9e66a77813c4dc8e5c633ec
@@ -46,6 +46,6 @@ SHA1 (patch-ef) = c8740b1c9cfac686f2e4e32c7613b5f02206459d
 SHA1 (patch-eg) = 84e816c95167828314ef901e324772249a407c41
 SHA1 (patch-fa) = b4a4b7334357ebcd1646886c18c9772e8b9ae765
 SHA1 (patch-fb) = 22a07628566b43aa786c410927d29a283e8cf141
-SHA1 (patch-fc) = 953be7fe89208be6740fe08e6e930643a30c46cb
+SHA1 (patch-fc) = 37c9b0897182de93a01f9620ef6346ef68157770
 SHA1 (patch-fd) = 3592c62ab0f0e5375fc433ef426bc56b1603a8f4
-SHA1 (patch-fe) = 4c6b2e8167080a69f638f232f865fbab2a74c537
+SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3
diff --git a/sysutils/xentools33/patches/patch-fc b/sysutils/xentools33/patches/patch-fc
index a1141428eea..9affdd4a8dd 100644
--- a/sysutils/xentools33/patches/patch-fc
+++ b/sysutils/xentools33/patches/patch-fc
@@ -1,13 +1,13 @@
-$NetBSD: patch-fc,v 1.1.1.1 2008/08/07 20:26:59 cegger Exp $
+$NetBSD: patch-fc,v 1.2 2008/08/15 14:06:54 cegger Exp $
 
---- ioemu/vl.c.orig	2008-08-01 14:38:07.000000000 +0000
+--- ioemu/vl.c.orig	2008-08-14 15:26:06.000000000 +0000
 +++ ioemu/vl.c
 @@ -108,7 +108,7 @@
  
  #include "exec-all.h"
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
-+#define DEFAULT_NETWORK_SCRIPT "@XENDCONFDIR@/qemu-ifup"
++#define DEFAULT_NETWORK_SCRIPT "@XENDCONFDIR@/scripts/qemu-ifup"
  #ifdef _BSD
  #define DEFAULT_BRIDGE "bridge0"
  #else 
diff --git a/sysutils/xentools33/patches/patch-fe b/sysutils/xentools33/patches/patch-fe
index 420f52b48bb..f43f134246f 100644
--- a/sysutils/xentools33/patches/patch-fe
+++ b/sysutils/xentools33/patches/patch-fe
@@ -1,6 +1,6 @@
-$NetBSD: patch-fe,v 1.2 2008/08/13 12:36:05 cegger Exp $
+$NetBSD: patch-fe,v 1.3 2008/08/15 14:06:54 cegger Exp $
 
---- ioemu/Makefile.target.orig	2008-08-07 08:56:22.000000000 +0000
+--- ioemu/Makefile.target.orig	2008-08-14 15:26:06.000000000 +0000
 +++ ioemu/Makefile.target
 @@ -382,6 +382,7 @@ AUDIODRV += sdlaudio.o
  endif
@@ -19,7 +19,7 @@ $NetBSD: patch-fe,v 1.2 2008/08/13 12:36:05 cegger Exp $
  endif
  
  cocoa.o: cocoa.m
-@@ -660,12 +661,12 @@ distclean: clean
+@@ -660,12 +661,11 @@ distclean: clean
  	rm -rf config.mak config.h
  
  install: all 
@@ -32,7 +32,6 @@ $NetBSD: patch-fe,v 1.2 2008/08/13 12:36:05 cegger Exp $
 -	$(INSTALL_PROG) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
 -	$(INSTALL_PROG) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
 +	$(BSD_INSTALL_DATA) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
-+	$(BSD_INSTALL_DATA) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
  
  ifneq ($(wildcard .depend),)
  include .depend