Tue Jun 28 16:28:06 2022 UTC ()
Update to xen 4.15.2, in preparation for removal of xen 4.11


(bouyer)
diff -r1.3 -r1.4 pkgsrc/sysutils/xenstoretools/DESCR
diff -r1.21 -r1.22 pkgsrc/sysutils/xenstoretools/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/xenstoretools/PLIST
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/xenstoretools/DESCR (expand / switch to unified diff)

--- pkgsrc/sysutils/xenstoretools/DESCR 2020/08/20 11:30:25 1.3
+++ pkgsrc/sysutils/xenstoretools/DESCR 2022/06/28 16:28:06 1.4
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1This package is a subset of the xentools411 package. It contains 1This package is a subset of the xentools415 package. It contains
2just the tools to manipulate xenstore from the guest VM. 2just the tools to manipulate xenstore from the guest VM.
cvs diff -r1.21 -r1.22 pkgsrc/sysutils/xenstoretools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xenstoretools/Makefile 2022/06/28 11:36:07 1.21
+++ pkgsrc/sysutils/xenstoretools/Makefile 2022/06/28 16:28:06 1.22
@@ -1,91 +1,106 @@ @@ -1,91 +1,106 @@
1# $NetBSD: Makefile,v 1.21 2022/06/28 11:36:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2022/06/28 16:28:06 bouyer Exp $
2# 2#
3 3
4# VERSION is set in xentool411/version.mk 4# VERSION is set in xentool415/version.mk
5PKGREVISION= 6 5.include "../../sysutils/xentools415/version.mk"
6.include "../../sysutils/xentools411/version.mk" 
7 6
8DIST_SUBDIR= xen411 
9DISTNAME= xen-${VERSION} 
10PKGNAME= xenstoretools-${VERSION} 7PKGNAME= xenstoretools-${VERSION}
11CATEGORIES= sysutils 8CATEGORIES= sysutils
12MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/ 
13 
14DISTFILES= ${DISTNAME}.tar.gz 
15 
16XEN_EXTFILES= http://xenbits.xensource.com/xen-extfiles/ 
17DIST_IPXE= ipxe-git-${VERSION_IPXE}.tar.gz 
18DISTFILES+= ${DIST_IPXE} 
19SITES.${DIST_IPXE} += ${XEN_EXTFILES} 
20 9
21MAINTAINER= sborrill@NetBSD.org 10MAINTAINER= sborrill@NetBSD.org
22HOMEPAGE= http://xen.org/ 11HOMEPAGE= http://xen.org/
23COMMENT= Xenstore Tools for Xen 4.11.x 12COMMENT= Xenstore Tools for Xen 4.15.x
24 13
25LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
26DISTINFO_FILE= ${.CURDIR}/../../sysutils/xentools411/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../sysutils/xentools415/distinfo
27PATCHDIR= ${.CURDIR}/../../sysutils/xentools411/patches 16PATCHDIR= ${.CURDIR}/../../sysutils/xentools415/patches
28INSTALL_DIRS= tools/xenstore tools/libs/toolcore 17INSTALL_DIRS= tools/xenstore tools/libs/toolcore tools/libs/store
 18INSTALL_DIRS+= tools/libs/toollog tools/libs/call tools/libs/evtchn
 19INSTALL_DIRS+= tools/libs/gnttab tools/libs/foreignmemory
 20INSTALL_DIRS+= tools/libs/devicemodel tools/libs/ctrl tools/libs/guest
29INSTALL_MAKE_FLAGS+= XENSTORE_XENSTORED=n 21INSTALL_MAKE_FLAGS+= XENSTORE_XENSTORED=n
30 22
31.if !exists(/usr/bin/iasl) 23.if !exists(/usr/bin/iasl)
32BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils 24BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
33.endif 25.endif
34 26
35GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
 28CONFIGURE_ARGS+= --enable-rpath --disable-golang
 29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
36# configure checks for more components than are required to build the 30# configure checks for more components than are required to build the
37# xenstore subdirectory, so provide dummy args to allow it to complete 31# xenstore subdirectory, so provide dummy args to allow it to complete
38# without adding unnecessary dependencies 32# without adding unnecessary dependencies
39CONFIGURE_ARGS+= ac_cv_path_AS86=/dummy 33CONFIGURE_ARGS+= ac_cv_path_AS86=/dummy
40CONFIGURE_ARGS+= ac_cv_path_LD86=/dummy 34CONFIGURE_ARGS+= ac_cv_path_LD86=/dummy
41CONFIGURE_ARGS+= ac_cv_path_BCC=/dummy 35CONFIGURE_ARGS+= ac_cv_path_BCC=/dummy
42CONFIGURE_ARGS+= ac_cv_lib_yajl_yajl_alloc=yes 36CONFIGURE_ARGS+= ac_cv_lib_yajl_yajl_alloc=yes
43CONFIGURE_ARGS+= ac_cv_lib_z_deflateCopy=yes 37CONFIGURE_ARGS+= ac_cv_lib_z_deflateCopy=yes
44CONFIGURE_ARGS+= ac_cv_header_argp_h=yes 38CONFIGURE_ARGS+= ac_cv_header_argp_h=yes
45CONFIGURE_ARGS+= ac_cv_lib_argp_argp_usage=yes 39CONFIGURE_ARGS+= ac_cv_lib_argp_argp_usage=yes
46CONFIGURE_ARGS+= pixman_CFLAGS=dummy 40CONFIGURE_ARGS+= pixman_CFLAGS=dummy
47CONFIGURE_ARGS+= pixman_LIBS=/dummy 41CONFIGURE_ARGS+= pixman_LIBS=/dummy
48 42
49PKG_SYSCONFSUBDIR= xen 43PKG_SYSCONFSUBDIR= xen
50BUILD_DEFS+= VARBASE 44BUILD_DEFS+= VARBASE
51 45
52ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 46ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64
53ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 47ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
54 48
55CONFLICTS+= libxen-[0-9]* 49CONFLICTS+= libxen-[0-9]*
56CONFLICTS+= xentools20-[0-9]* 50CONFLICTS+= xentools20-[0-9]*
57CONFLICTS+= xentools3* 51CONFLICTS+= xentools3*
58CONFLICTS+= xentools4* 52CONFLICTS+= xentools4*
59 53
60USE_TOOLS+= bash gmake pkg-config perl 54USE_TOOLS+= bash gmake pkg-config perl bison
61 55
62MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} 56MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
63MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} 57MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
64MAKE_ENV+= VARBASE=${VARBASE} 58MAKE_ENV+= VARBASE=${VARBASE}
65 59
66RCD_SCRIPTS= xendomname 60RCD_SCRIPTS= xendomname
67FILES_SUBST+= PREFIX=${PREFIX} 61FILES_SUBST+= PREFIX=${PREFIX}
68 62
 63SUBST_CLASSES+= rpath-link
 64SUBST_STAGE.rpath-link= pre-configure
 65SUBST_MESSAGE.rpath-link= Fixing rpath-link syntax
 66SUBST_FILES.rpath-link+= tools/Rules.mk
 67SUBST_SED.rpath-link+= -e 's/-rpath-link=/-rpath-link,/g'
 68
69.include "../../mk/bsd.prefs.mk" 69.include "../../mk/bsd.prefs.mk"
70 70
71INSTALLATION_DIRS= bin include lib 71INSTALLATION_DIRS= bin include lib
72 72
73pre-build: 
74 ${LN} -s ../../xen/include/public ${WRKSRC}/tools/include/xen 
75 
76do-build: 73do-build:
77 ${RUN}${_ULIMIT_CMD} \ 74 cd ${WRKSRC}/ && ${BUILD_MAKE_CMD} build-tools-public-headers
78 cd ${WRKSRC}/tools/libs/toolcore && \ 75 cd ${WRKSRC}/tools/libs/toolcore && \
 76 ${BUILD_MAKE_CMD} all
 77 cd ${WRKSRC}/tools/libs/store && \
 78 ${BUILD_MAKE_CMD} all
 79 cd ${WRKSRC}/tools/libs/toollog && \
 80 ${BUILD_MAKE_CMD} all
 81 cd ${WRKSRC}/tools/libs/call && \
 82 ${BUILD_MAKE_CMD} all
 83 cd ${WRKSRC}/tools/libs/evtchn && \
 84 ${BUILD_MAKE_CMD} all
 85 cd ${WRKSRC}/tools/libs/gnttab && \
 86 ${BUILD_MAKE_CMD} all
 87 cd ${WRKSRC}/tools/libs/foreignmemory && \
 88 ${BUILD_MAKE_CMD} all
 89 cd ${WRKSRC}/tools/libs/devicemodel && \
 90 ${BUILD_MAKE_CMD} all
 91 cd ${WRKSRC}/tools/libs/ctrl && \
 92 ${BUILD_MAKE_CMD} all
 93 cd ${WRKSRC}/tools/libs/guest && \
79 ${BUILD_MAKE_CMD} all 94 ${BUILD_MAKE_CMD} all
80 ${RUN}${_ULIMIT_CMD} \ 95 ${RUN}${_ULIMIT_CMD} \
81 cd ${WRKSRC}/tools/xenstore && \ 96 cd ${WRKSRC}/tools/xenstore && \
82 ${BUILD_MAKE_CMD} clients 97 ${BUILD_MAKE_CMD} clients
83 98
84pre-install: 99pre-install:
85 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pkgconfig 100 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
86 101
87.include "../../lang/python/application.mk" 102.include "../../lang/python/application.mk"
88.include "../../lang/python/extension.mk" 103.include "../../lang/python/extension.mk"
89.include "../../devel/glib2/buildlink3.mk" 104.include "../../devel/glib2/buildlink3.mk"
90 105
91.include "../../mk/bsd.pkg.mk" 106.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/xenstoretools/PLIST (expand / switch to unified diff)

--- pkgsrc/sysutils/xenstoretools/PLIST 2020/10/23 12:44:44 1.7
+++ pkgsrc/sysutils/xenstoretools/PLIST 2022/06/28 16:28:06 1.8
@@ -1,28 +1,78 @@ @@ -1,28 +1,78 @@
1@comment $NetBSD: PLIST,v 1.7 2020/10/23 12:44:44 sborrill Exp $ 1@comment $NetBSD: PLIST,v 1.8 2022/06/28 16:28:06 bouyer Exp $
2bin/xenstore 2bin/xenstore
3bin/xenstore-chmod 3bin/xenstore-chmod
4bin/xenstore-control 4bin/xenstore-control
5bin/xenstore-exists 5bin/xenstore-exists
6bin/xenstore-list 6bin/xenstore-list
7bin/xenstore-ls 7bin/xenstore-ls
8bin/xenstore-read 8bin/xenstore-read
9bin/xenstore-rm 9bin/xenstore-rm
10bin/xenstore-watch 10bin/xenstore-watch
11bin/xenstore-write 11bin/xenstore-write
 12include/xencall.h
 13include/xenctrl.h
 14include/xenctrl_compat.h
 15include/xendevicemodel.h
 16include/xenevtchn.h
 17include/xenforeignmemory.h
 18include/xengnttab.h
 19include/xenguest.h
12include/xenstore-compat/xs.h 20include/xenstore-compat/xs.h
13include/xenstore-compat/xs_lib.h 21include/xenstore-compat/xs_lib.h
14include/xenstore.h 22include/xenstore.h
15include/xenstore_lib.h 23include/xenstore_lib.h
 24include/xentoolcore.h
 25include/xentoolcore_internal.h
 26include/xentoollog.h
16include/xs.h 27include/xs.h
17include/xs_lib.h 28include/xs_lib.h
18include/xentoolcore.h 29lib/libxencall.a
 30lib/libxencall.so
 31lib/libxencall.so.1
 32lib/libxencall.so.1.3
 33lib/libxenctrl.a
 34lib/libxenctrl.so
 35lib/libxenctrl.so.4.15
 36lib/libxenctrl.so.4.15.0
 37lib/libxendevicemodel.a
 38lib/libxendevicemodel.so
 39lib/libxendevicemodel.so.1
 40lib/libxendevicemodel.so.1.4
 41lib/libxenevtchn.a
 42lib/libxenevtchn.so
 43lib/libxenevtchn.so.1
 44lib/libxenevtchn.so.1.2
 45lib/libxenforeignmemory.a
 46lib/libxenforeignmemory.so
 47lib/libxenforeignmemory.so.1
 48lib/libxenforeignmemory.so.1.4
 49lib/libxengnttab.a
 50lib/libxengnttab.so
 51lib/libxengnttab.so.1
 52lib/libxengnttab.so.1.2
 53lib/libxenguest.a
 54lib/libxenguest.so
 55lib/libxenguest.so.4.15
 56lib/libxenguest.so.4.15.0
19lib/libxenstore.a 57lib/libxenstore.a
20lib/libxenstore.so 58lib/libxenstore.so
21lib/libxenstore.so.3.0 59lib/libxenstore.so.3.0
22lib/libxenstore.so.3.0.3 60lib/libxenstore.so.3.0.3
23lib/libxentoolcore.a 61lib/libxentoolcore.a
24lib/libxentoolcore.so 62lib/libxentoolcore.so
25lib/libxentoolcore.so.1 63lib/libxentoolcore.so.1
26lib/libxentoolcore.so.1.0 64lib/libxentoolcore.so.1.0
27share/pkgconfig/xenstore.pc 65lib/libxentoollog.a
28share/pkgconfig/xentoolcore.pc 66lib/libxentoollog.so
 67lib/libxentoollog.so.1
 68lib/libxentoollog.so.1.0
 69lib/pkgconfig/xencall.pc
 70lib/pkgconfig/xencontrol.pc
 71lib/pkgconfig/xendevicemodel.pc
 72lib/pkgconfig/xenevtchn.pc
 73lib/pkgconfig/xenforeignmemory.pc
 74lib/pkgconfig/xengnttab.pc
 75lib/pkgconfig/xenguest.pc
 76lib/pkgconfig/xenstore.pc
 77lib/pkgconfig/xentoolcore.pc
 78lib/pkgconfig/xentoollog.pc