Re: Xen3/NetBSD dom0 progress

[Yoshito Komatsu <ykomatsu%akaumigame.org@localhost>]

Hello.
Thank you for your work.

Manuel Bouyer wrote:
>>> I have a package for xentools30, which I've not commited yet.
>>> I'll let it stabilize a bit before commit, but if anyone wants a copy
>>> just ask.
>> Manuel, please put it somewhere
> 
> OK: ftp://asim.lip6.fr/outgoing/xentools30.tgz

I tried to make it.

># make install
[snip]
>===> Registering installation for xentools30-3.0.2.2
>xentools30-3.0.2.2 requires installed package python24-2.4.3nb2
>/usr/pkg/bin/cpuperf-xen:       -lxenctrl.3.0 => not found
>*** The above programs/libs will not find the listed shared libraries
>    at runtime. Please fix the package (add -Wl,-R.../lib in the right places)!
>*** Error code 1

I think that the following patch will fix this problem.
(It contains codes to fix some pkglint errors.)

Regards,
-- 
Yoshito Komatsu <ykomatsu%akaumigame.org@localhost>

diff -uNr xentools30.orig/Makefile xentools30/Makefile
--- xentools30.orig/Makefile    2006-05-08 09:38:49.000000000 +0900
+++ xentools30/Makefile 2006-05-08 10:02:14.000000000 +0900
@@ -23,7 +23,7 @@
 WRKSRC=                        ${WRKDIR}/xen-3.0.2-2/tools
 
 EGDIR=                 ${PREFIX}/share/examples/xen
-MESSAGE_SUBST=         EGDIR=${EGDIR}
+MESSAGE_SUBST+=                EGDIR=${EGDIR}
 
 USE_TOOLS+=            gmake
 MAKE_ENV+=             EGDIR=${EGDIR:Q}
@@ -57,7 +57,7 @@
 SUBST_STAGE.paths=      pre-configure
 SUBST_FILES.paths=      ioemu/vl.c
 SUBST_SED.paths=        -e "s|/usr/sbin|${PREFIX}/sbin|g"
-SUBST_MESSAGE.paths=    "Fixing hardcoded paths."
+SUBST_MESSAGE.paths=    Fixing hardcoded paths.
 
 SUBST_STAGE.py=                pre-configure
 SUBST_FILES.py=                pygrub/Makefile
@@ -139,7 +139,7 @@
 .for s in ${XEND_SCRIPTS}
        ${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${EGDIR}/${s}
 .endfor
-       @rm -rf ${PREFIX}/lib/xen
+       ${RM} -rf ${PREFIX}/lib/xen
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff -uNr xentools30.orig/PLIST xentools30/PLIST
--- xentools30.orig/PLIST       2006-05-08 09:38:49.000000000 +0900
+++ xentools30/PLIST    2006-05-08 09:41:20.000000000 +0900
@@ -244,8 +244,6 @@
 share/examples/xen/xmexample1
 share/examples/xen/xmexample2
 share/examples/xen/xmexample3
-
-
 @dirrm share/examples/xen
 @dirrm ${PYSITELIB}/xen/xm/tests
 @dirrm ${PYSITELIB}/xen/xm
diff -uNr xentools30.orig/distinfo xentools30/distinfo
--- xentools30.orig/distinfo    2006-05-08 09:38:49.000000000 +0900
+++ xentools30/distinfo 2006-05-08 10:42:34.000000000 +0900
@@ -25,7 +25,7 @@
 SHA1 (patch-au) = a992f922bdd2966c42e71202bb0499b2fbaec5c9
 SHA1 (patch-av) = feb46154a7ff886a480f4089304c29189e4e5f15
 SHA1 (patch-aw) = 92107acf79bcd65330f279d409e8318f7f2f88c5
-SHA1 (patch-ax) = bfb0446c02f72fcff863dd4afd373848ea6038c5
+SHA1 (patch-ax) = bba82ce8f8dcae534241525711ad24c7828cb64c
 SHA1 (patch-ay) = d731e9b53a4d4e47bf254d35578cf0267f124b8d
 SHA1 (patch-az) = 5bb357f715f1244b080929cd8bec3bd3b9993cc8
 SHA1 (patch-ba) = e82485eecbc1d7686193df960f136b7357f7a26a
diff -uNr xentools30.orig/patches/patch-ax xentools30/patches/patch-ax
--- xentools30.orig/patches/patch-ax    2006-05-08 09:38:49.000000000 +0900
+++ xentools30/patches/patch-ax 2006-05-08 10:40:22.000000000 +0900
@@ -1,8 +1,15 @@
 $NetBSD$
 
---- misc/cpuperf/Makefile.orig 2006-01-31 17:09:21.000000000 +0100
+--- misc/cpuperf/Makefile.orig 2006-04-14 02:48:38.000000000 +0900
 +++ misc/cpuperf/Makefile
-@@ -44,5 +44,5 @@ cpuperf-perfcntr: cpuperf.c $(HDRS) Make
+@@ -36,5 +36,5 @@ clean:
+ 
+ cpuperf-xen: cpuperf.c $(HDRS) Makefile
+-      $(CC) $(CFLAGS) -I $(XEN_LIBXC) -L$(XEN_LIBXC) -lxenctrl -DXENO -o $@ $<
++      $(CC) $(CFLAGS) $(LDFLAGS) -I$(XEN_LIBXC) -L$(XEN_LIBXC) -lxenctrl 
-DXENO -o $@ $<
+ 
+ cpuperf-perfcntr: cpuperf.c $(HDRS) Makefile
+@@ -42,5 +42,5 @@ cpuperf-perfcntr: cpuperf.c $(HDRS) Make
  
  install: all
 -      $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin