Date: Wed, 18 Mar 2015 16:06:05 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280225 - in projects/release-pkg: . release/packages Message-ID: <201503181606.t2IG65oF049226@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Mar 18 16:06:04 2015 New Revision: 280225 URL: https://svnweb.freebsd.org/changeset/base/280225 Log: 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 Modified: projects/release-pkg/Makefile.inc1 projects/release-pkg/release/packages/runtime.ucl Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Wed Mar 18 15:20:08 2015 (r280224) +++ projects/release-pkg/Makefile.inc1 Wed Mar 18 16:06:04 2015 (r280225) @@ -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 }' \ Modified: projects/release-pkg/release/packages/runtime.ucl ============================================================================== --- projects/release-pkg/release/packages/runtime.ucl Wed Mar 18 15:20:08 2015 (r280224) +++ projects/release-pkg/release/packages/runtime.ucl Wed Mar 18 16:06:04 2015 (r280225) @@ -11,3 +11,7 @@ licenses = [ BSD2CLAUSE ] desc = <<EOD %DESC% EOD +post-install = <<EOD + cap_mkdb %CAP_MKDB_ENDIAN% ${ROOTDIR}/etc/login.conf + pwd_mkdb %PWD_MKDB_ENDIAN% -i -p -d ${ROOTDIR}/etc ${ROOTDIR}/etc/master.passwd +EOD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503181606.t2IG65oF049226>