tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xentools4*: honor PKG_SYSCONFIGDIR



Building xentools45 with PKG_SYSCONFBASE=/etc doesn't work correctly.
E.g. the hotplug scripts get install to /usr/pkg/etc/scripts and xl(1) is
confused about /etc/xen vs. /usr/pkg/etc/xen.

The following patch fixes that (including a hard-coded referece to
/etc/xen in the documentation).  Any objections?

While I'm here, why are EGDIR, BASH_COMPLETION_DIR, and VARBASE
put into MAKE_ENV?  They don't seem to be used in the patched workdir.

--chris

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools45/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- Makefile	26 Feb 2016 10:24:14 -0000	1.26
+++ Makefile	24 Mar 2016 22:17:34 -0000
@@ -49,13 +49,14 @@
 #CONFIGURE_ARGS+=	--enable-xenapi
 CONFIGURE_ARGS+=	--disable-seabios
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+
 MAKE_ENV+=		PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
 MAKE_ENV+=		EGDIR=${EGDIR}
 MAKE_ENV+=		XEN_EXAMPLES_DIR=${EGDIR}
 MAKE_ENV+=		BASH_COMPLETION_DIR=${EGDIR}
 MAKE_ENV+=		MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
 MAKE_ENV+=		VARBASE=${VARBASE}
-MAKE_ENV+=		XEN_CONFIG_DIR=${PKG_SYSCONFDIR}
 MAKE_ENV+=		V=YES
 MAKE_ENV+=		NO_WERROR=1
 
@@ -106,8 +107,8 @@
 
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	pre-configure
-SUBST_FILES.conf+=	ocaml/xenstored/define.ml
-SUBST_SED.conf=		-e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
+SUBST_FILES.conf+=	../docs/misc/xl-disk-configuration.txt
+SUBST_SED.conf=		-e "s,/etc/xen,${PKG_SYSCONFDIR},g"
 
 XEND_SCRIPTS=		block vif-bridge vif-ip qemu-ifup hotplugpath.sh
 


Home | Main Index | Thread Index | Old Index