From 8cf263c8435c55125d72959dd98fbc2cfba83d42 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 18 Mar 2015 16:06:04 +0000 Subject: [PATCH] run pw_mkdb and cap_mkdb at post-installation for cross installation the version from the host would be run but the generated files will be on the target respecing the endianness of the target --- Makefile.inc1 | 6 +++++- release/packages/runtime.ucl | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2e9f6cc8285f..d00a24689d64 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1218,13 +1218,17 @@ create-world-packages: test -f ${SRCDIR}/release/packages/$${plist%.plist}.ucl || \ ( echo "Unkown package FreeBSD-$${plist%.plist}" ; false ) ; \ done - @for plist in ${DESTDIR}/*.plist; do \ + @cap_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VCAP_MKDB_ENDIAN` ; \ + pwd_arg=`cd ${SRCDIR}/etc ; ${MAKE} -VPWD_MKDB_ENDIAN` ; \ + for plist in ${DESTDIR}/*.plist; do \ plist=$${plist##*/} ; \ pkgname=$${plist%.plist} ; \ sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/$${pkgname}/" \ -e "s/%COMMENT%/Generic comment for $${pkgname}/" \ -e "s/%DESC%/Generic description for $${pkgname}/" \ + -e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \ + -e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \ ${SRCDIR}/release/packages/$${pkgname}.ucl \ > ${DESTDIR}/$${pkgname}.ucl ; \ awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl index 862adb1b89d9..fd52834e1c32 100644 --- a/release/packages/runtime.ucl +++ b/release/packages/runtime.ucl @@ -11,3 +11,7 @@ licenses = [ BSD2CLAUSE ] desc = <