Add back sysutils/xenstoretools, based on xentools411

6 files changed, 150 insertions, 3 deletions

diff --git a/sysutils/xenstoretools/DESCR b/sysutils/xenstoretools/DESCR
new file mode 100644
index 00000000000..e980bb7bc41
--- /dev/null
+++ b/sysutils/xenstoretools/DESCR
@@ -0,0 +1,2 @@
+This package is a subset of the xentools411 package. It contains
+just the tools to manipulate xenstore from the guest VM.
diff --git a/sysutils/xenstoretools/Makefile b/sysutils/xenstoretools/Makefile
new file mode 100644
index 00000000000..986945178e9
--- /dev/null
+++ b/sysutils/xenstoretools/Makefile
@@ -0,0 +1,90 @@
+# $NetBSD: Makefile,v 1.15 2020/08/20 11:30:25 bouyer Exp $
+#
+
+# VERSION is set in xentool411/version.mk
+.include		"../../sysutils/xentools411/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
+HOMEPAGE=		http://xen.org/
+COMMENT=		Xenstore Tools for Xen 4.11.x
+
+LICENSE=		gnu-gpl-v2
+DISTINFO_FILE=		${.CURDIR}/../../sysutils/xentools411/distinfo
+PATCHDIR=		${.CURDIR}/../../sysutils/xentools411/patches
+INSTALL_DIRS=		tools/xenstore
+INSTALL_MAKE_FLAGS+=	XENSTORE_XENSTORED=n
+
+.if !exists(/usr/bin/iasl)
+BUILD_DEPENDS+=	acpica-utils-[0-9]*:../../sysutils/acpica-utils
+.endif
+
+GNU_CONFIGURE=		yes
+# 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
+CONFIGURE_ARGS+=	ac_cv_path_AS86=/dummy
+CONFIGURE_ARGS+=	ac_cv_path_LD86=/dummy
+CONFIGURE_ARGS+=	ac_cv_path_BCC=/dummy
+CONFIGURE_ARGS+=	ac_cv_lib_yajl_yajl_alloc=yes
+CONFIGURE_ARGS+=	ac_cv_lib_z_deflateCopy=yes
+CONFIGURE_ARGS+=	ac_cv_header_argp_h=yes
+CONFIGURE_ARGS+=	ac_cv_lib_argp_argp_usage=yes
+CONFIGURE_ARGS+=	pixman_CFLAGS=dummy
+CONFIGURE_ARGS+=	pixman_LIBS=/dummy
+
+PKG_SYSCONFSUBDIR=	xen
+BUILD_DEFS+=		VARBASE
+
+ONLY_FOR_PLATFORM=	Linux-2.6*-i386 Linux-2.6*-x86_64
+ONLY_FOR_PLATFORM+=	NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
+
+CONFLICTS+=		libxen-[0-9]*
+CONFLICTS+=		xentools20-[0-9]*
+CONFLICTS+=		xentools3*
+CONFLICTS+=		xentools4*
+
+USE_TOOLS+=		bash gmake pkg-config perl
+
+MAKE_ENV+=		PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
+MAKE_ENV+=		MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
+MAKE_ENV+=		VARBASE=${VARBASE}
+
+RCD_SCRIPTS=		xendomname
+FILES_SUBST+=		PREFIX=${PREFIX}
+
+.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  &&                            \
+		${BUILD_MAKE_CMD} all
+	${RUN}${_ULIMIT_CMD}                                            \
+	cd ${WRKSRC}/tools/xenstore  &&                                 \
+		${BUILD_MAKE_CMD} clients
+
+pre-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pkgconfig
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../devel/glib2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xenstoretools/PLIST b/sysutils/xenstoretools/PLIST
new file mode 100644
index 00000000000..a6a6f8c905a
--- /dev/null
+++ b/sysutils/xenstoretools/PLIST
@@ -0,0 +1,22 @@
+@comment $NetBSD: PLIST,v 1.6 2020/08/20 11:30:25 bouyer Exp $
+bin/xenstore
+bin/xenstore-chmod
+bin/xenstore-control
+bin/xenstore-exists
+bin/xenstore-list
+bin/xenstore-ls
+bin/xenstore-read
+bin/xenstore-rm
+bin/xenstore-watch
+bin/xenstore-write
+include/xenstore-compat/xs.h
+include/xenstore-compat/xs_lib.h
+include/xenstore.h
+include/xenstore_lib.h
+include/xs.h
+include/xs_lib.h
+lib/libxenstore.a
+lib/libxenstore.so
+lib/libxenstore.so.3.0
+lib/libxenstore.so.3.0.3
+share/pkgconfig/xenstore.pc
diff --git a/sysutils/xenstoretools/files/xendomname.sh b/sysutils/xenstoretools/files/xendomname.sh
new file mode 100644
index 00000000000..6f37a9414a8
--- /dev/null
+++ b/sysutils/xenstoretools/files/xendomname.sh
@@ -0,0 +1,26 @@
+#!@RCD_SCRIPTS_SHELL@
+
+# PROVIDE: xendomname
+# REQUIRE: network mountcritlocal
+# BEFORE:  dhcpcd
+#
+# Sets the hostname to the xen domain name
+# (dhcpcd can pick it up and send it to the DHCP server.)
+#
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name=xendomname
+rcvar=$name
+start_cmd="xendomname_start"
+
+xendomname_start()
+{
+	mount /kern || true
+	dname="`@PREFIX@/bin/xenstore-read name`"
+	echo "Setting hostname to xen domain name: $dname"
+	hostname "$dname"
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/sysutils/xentools411/Makefile b/sysutils/xentools411/Makefile
index fd1ee912f2a..c261ad09d56 100644
--- a/sysutils/xentools411/Makefile
+++ b/sysutils/xentools411/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2020/08/17 20:37:53 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2020/08/20 11:30:25 bouyer Exp $
 #
-VERSION=	4.11.3
-VERSION_IPXE=	356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d
+# VERSION is set in version.mk as it is shared with other packages
+.include	"version.mk"
+
 DIST_IPXE=	ipxe-git-${VERSION_IPXE}.tar.gz
 
 DIST_SUBDIR=		xen411
diff --git a/sysutils/xentools411/version.mk b/sysutils/xentools411/version.mk
new file mode 100644
index 00000000000..a9d4b6f8746
--- /dev/null
+++ b/sysutils/xentools411/version.mk
@@ -0,0 +1,6 @@
+# $NetBSD: version.mk,v 1.1 2020/08/20 11:30:25 bouyer Exp $
+#
+# Version number is used by xentools411 and xenstoretools
+
+VERSION=	4.11.3
+VERSION_IPXE=	356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d