pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/xenstoretools Update to xen 4.15.2, in prepar...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d18a94cafecf
branches: trunk
changeset: 381117:d18a94cafecf
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Tue Jun 28 16:28:06 2022 +0000
description:
Update to xen 4.15.2, in preparation for removal of xen 4.11
diffstat:
sysutils/xenstoretools/DESCR | 2 +-
sysutils/xenstoretools/Makefile | 65 +++++++++++++++++++++++++---------------
sysutils/xenstoretools/PLIST | 58 ++++++++++++++++++++++++++++++++++--
3 files changed, 95 insertions(+), 30 deletions(-)
diffs (203 lines):
diff -r 2e50cdb6ce4d -r d18a94cafecf sysutils/xenstoretools/DESCR
--- a/sysutils/xenstoretools/DESCR Tue Jun 28 16:26:34 2022 +0000
+++ b/sysutils/xenstoretools/DESCR Tue Jun 28 16:28:06 2022 +0000
@@ -1,2 +1,2 @@
-This package is a subset of the xentools411 package. It contains
+This package is a subset of the xentools415 package. It contains
just the tools to manipulate xenstore from the guest VM.
diff -r 2e50cdb6ce4d -r d18a94cafecf sysutils/xenstoretools/Makefile
--- a/sysutils/xenstoretools/Makefile Tue Jun 28 16:26:34 2022 +0000
+++ b/sysutils/xenstoretools/Makefile Tue Jun 28 16:28:06 2022 +0000
@@ -1,31 +1,23 @@
-# $NetBSD: Makefile,v 1.21 2022/06/28 11:36:07 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/06/28 16:28:06 bouyer Exp $
#
-# VERSION is set in xentool411/version.mk
-PKGREVISION= 6
-.include "../../sysutils/xentools411/version.mk"
+# VERSION is set in xentool415/version.mk
+.include "../../sysutils/xentools415/version.mk"
-DIST_SUBDIR= xen411
-DISTNAME= xen-${VERSION}
PKGNAME= xenstoretools-${VERSION}
CATEGORIES= sysutils
-MASTER_SITES= https://downloads.xenproject.org/release/xen/${VERSION}/
-
-DISTFILES= ${DISTNAME}.tar.gz
-
-XEN_EXTFILES= http://xenbits.xensource.com/xen-extfiles/
-DIST_IPXE= ipxe-git-${VERSION_IPXE}.tar.gz
-DISTFILES+= ${DIST_IPXE}
-SITES.${DIST_IPXE} += ${XEN_EXTFILES}
MAINTAINER= sborrill%NetBSD.org@localhost
HOMEPAGE= http://xen.org/
-COMMENT= Xenstore Tools for Xen 4.11.x
+COMMENT= Xenstore Tools for Xen 4.15.x
LICENSE= gnu-gpl-v2
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/xentools411/distinfo
-PATCHDIR= ${.CURDIR}/../../sysutils/xentools411/patches
-INSTALL_DIRS= tools/xenstore tools/libs/toolcore
+DISTINFO_FILE= ${.CURDIR}/../../sysutils/xentools415/distinfo
+PATCHDIR= ${.CURDIR}/../../sysutils/xentools415/patches
+INSTALL_DIRS= tools/xenstore tools/libs/toolcore tools/libs/store
+INSTALL_DIRS+= tools/libs/toollog tools/libs/call tools/libs/evtchn
+INSTALL_DIRS+= tools/libs/gnttab tools/libs/foreignmemory
+INSTALL_DIRS+= tools/libs/devicemodel tools/libs/ctrl tools/libs/guest
INSTALL_MAKE_FLAGS+= XENSTORE_XENSTORED=n
.if !exists(/usr/bin/iasl)
@@ -33,6 +25,8 @@
.endif
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-rpath --disable-golang
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
# configure checks for more components than are required to build the
# xenstore subdirectory, so provide dummy args to allow it to complete
# without adding unnecessary dependencies
@@ -57,7 +51,7 @@
CONFLICTS+= xentools3*
CONFLICTS+= xentools4*
-USE_TOOLS+= bash gmake pkg-config perl
+USE_TOOLS+= bash gmake pkg-config perl bison
MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
@@ -66,23 +60,44 @@
RCD_SCRIPTS= xendomname
FILES_SUBST+= PREFIX=${PREFIX}
+SUBST_CLASSES+= rpath-link
+SUBST_STAGE.rpath-link= pre-configure
+SUBST_MESSAGE.rpath-link= Fixing rpath-link syntax
+SUBST_FILES.rpath-link+= tools/Rules.mk
+SUBST_SED.rpath-link+= -e 's/-rpath-link=/-rpath-link,/g'
+
.include "../../mk/bsd.prefs.mk"
INSTALLATION_DIRS= bin include lib
-pre-build:
- ${LN} -s ../../xen/include/public ${WRKSRC}/tools/include/xen
-
do-build:
- ${RUN}${_ULIMIT_CMD} \
- cd ${WRKSRC}/tools/libs/toolcore && \
+ cd ${WRKSRC}/ && ${BUILD_MAKE_CMD} build-tools-public-headers
+ cd ${WRKSRC}/tools/libs/toolcore && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/store && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/toollog && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/call && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/evtchn && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/gnttab && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/foreignmemory && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/devicemodel && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/ctrl && \
+ ${BUILD_MAKE_CMD} all
+ cd ${WRKSRC}/tools/libs/guest && \
${BUILD_MAKE_CMD} all
${RUN}${_ULIMIT_CMD} \
cd ${WRKSRC}/tools/xenstore && \
${BUILD_MAKE_CMD} clients
pre-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pkgconfig
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
diff -r 2e50cdb6ce4d -r d18a94cafecf sysutils/xenstoretools/PLIST
--- a/sysutils/xenstoretools/PLIST Tue Jun 28 16:26:34 2022 +0000
+++ b/sysutils/xenstoretools/PLIST Tue Jun 28 16:28:06 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2020/10/23 12:44:44 sborrill Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/06/28 16:28:06 bouyer Exp $
bin/xenstore
bin/xenstore-chmod
bin/xenstore-control
@@ -9,13 +9,51 @@
bin/xenstore-rm
bin/xenstore-watch
bin/xenstore-write
+include/xencall.h
+include/xenctrl.h
+include/xenctrl_compat.h
+include/xendevicemodel.h
+include/xenevtchn.h
+include/xenforeignmemory.h
+include/xengnttab.h
+include/xenguest.h
include/xenstore-compat/xs.h
include/xenstore-compat/xs_lib.h
include/xenstore.h
include/xenstore_lib.h
+include/xentoolcore.h
+include/xentoolcore_internal.h
+include/xentoollog.h
include/xs.h
include/xs_lib.h
-include/xentoolcore.h
+lib/libxencall.a
+lib/libxencall.so
+lib/libxencall.so.1
+lib/libxencall.so.1.3
+lib/libxenctrl.a
+lib/libxenctrl.so
+lib/libxenctrl.so.4.15
+lib/libxenctrl.so.4.15.0
+lib/libxendevicemodel.a
+lib/libxendevicemodel.so
+lib/libxendevicemodel.so.1
+lib/libxendevicemodel.so.1.4
+lib/libxenevtchn.a
+lib/libxenevtchn.so
+lib/libxenevtchn.so.1
+lib/libxenevtchn.so.1.2
+lib/libxenforeignmemory.a
+lib/libxenforeignmemory.so
+lib/libxenforeignmemory.so.1
+lib/libxenforeignmemory.so.1.4
+lib/libxengnttab.a
+lib/libxengnttab.so
+lib/libxengnttab.so.1
+lib/libxengnttab.so.1.2
+lib/libxenguest.a
+lib/libxenguest.so
+lib/libxenguest.so.4.15
+lib/libxenguest.so.4.15.0
lib/libxenstore.a
lib/libxenstore.so
lib/libxenstore.so.3.0
@@ -24,5 +62,17 @@
lib/libxentoolcore.so
lib/libxentoolcore.so.1
lib/libxentoolcore.so.1.0
-share/pkgconfig/xenstore.pc
-share/pkgconfig/xentoolcore.pc
+lib/libxentoollog.a
+lib/libxentoollog.so
+lib/libxentoollog.so.1
+lib/libxentoollog.so.1.0
+lib/pkgconfig/xencall.pc
+lib/pkgconfig/xencontrol.pc
+lib/pkgconfig/xendevicemodel.pc
+lib/pkgconfig/xenevtchn.pc
+lib/pkgconfig/xenforeignmemory.pc
+lib/pkgconfig/xengnttab.pc
+lib/pkgconfig/xenguest.pc
+lib/pkgconfig/xenstore.pc
+lib/pkgconfig/xentoolcore.pc
+lib/pkgconfig/xentoollog.pc
Home |
Main Index |
Thread Index |
Old Index