From owner-svn-src-projects@FreeBSD.ORG Wed Mar 18 16:06:05 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9995211; Wed, 18 Mar 2015 16:06:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB6E2FC5; Wed, 18 Mar 2015 16:06:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2IG65qu049229; Wed, 18 Mar 2015 16:06:05 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2IG65oF049226; Wed, 18 Mar 2015 16:06:05 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503181606.t2IG65oF049226@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 18 Mar 2015 16:06:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280225 - in projects/release-pkg: . release/packages X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2015 16:06:06 -0000 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 = <