From owner-svn-src-projects@freebsd.org Fri Jan 22 18:06:11 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A208A8C8C4 for ; Fri, 22 Jan 2016 18:06:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3DC641A8C; Fri, 22 Jan 2016 18:06:11 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0MI6A4R070209; Fri, 22 Jan 2016 18:06:10 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0MI6AcP070208; Fri, 22 Jan 2016 18:06:10 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601221806.u0MI6AcP070208@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 22 Jan 2016 18:06:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r294580 - projects/release-pkg 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.20 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: Fri, 22 Jan 2016 18:06:11 -0000 Author: gjb Date: Fri Jan 22 18:06:09 2016 New Revision: 294580 URL: https://svnweb.freebsd.org/changeset/base/294580 Log: Create a _pkgbootstrap target, and remove the env(1) prefix to pkg(8) commands. Move the resulting packages outside STAGEDIR to minimize pollution. When invoking 'pkg create', include the ABI in the REPODIR path so the correct hierarchy is created for cross-builds. Move the STAGEDIR and REPODIR declarations above the targets that use them to keep things cleaner, and move the packages target. Include '-o ABIFILE=DESTDIR/bin/sh' in pkg(8) invocations in the create-kernel-packages target. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Fri Jan 22 17:17:27 2016 (r294579) +++ projects/release-pkg/Makefile.inc1 Fri Jan 22 18:06:09 2016 (r294580) @@ -1357,7 +1357,19 @@ packagekernel: .endif .endif -create-world-packages: +STAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/stage +REPODIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo + +_pkgbootstrap: + @env ASSUME_ALWAYS_YES=YES pkg bootstrap + +packages: _pkgbootstrap + @mkdir -p ${STAGEDIR} ${REPODIR} + ${_+_}@cd ${.CURDIR}; \ + ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} -DNO_ROOT -B stageworld ; \ + ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages + +create-world-packages: _pkgbootstrap @rm -f ${DESTDIR}/*.plist 2>/dev/null || : @cd ${DESTDIR} ; \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ @@ -1384,21 +1396,13 @@ create-world-packages: /^name/ { printf("===> Creating %s-", $$2); next } \ /^version/ { print $$2; next } \ ' ${DESTDIR}/$${pkgname}.ucl ; \ - env ASSUME_ALWAYS_YES="YES" pkg -o ABI_FILE=${DESTDIR}/bin/sh \ + pkg -o ABI_FILE=${DESTDIR}/bin/sh \ create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ - -r ${DESTDIR} -o ${DESTDIR} ; \ + -r ${DESTDIR} -o ${REPODIR}/$$(pkg config ABI)/latest ; \ done -STAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/stage - -packages: - @mkdir -p ${MAKEOBJDIRPREFIX}${.CURDIR}/stage - ${_+_}@cd ${.CURDIR}; \ - ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} -DNO_ROOT -B stageworld ; \ - ${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages - -create-kernel-packages: +create-kernel-packages: _pkgbootstrap @cd ${DESTDIR}/${DISTDIR} ; \ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \ ${DESTDIR}/${DISTDIR}/kernel.meta @@ -1415,7 +1419,7 @@ create-kernel-packages: ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST - @env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ + @pkg -o ABI_FILE=${DESTDIR}/bin/sh create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -r ${DESTDIR}/${DISTDIR}/kernel \ -o ${DESTDIR} @@ -1438,7 +1442,7 @@ create-kernel-packages: ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST - @env ASSUME_ALWAYS_YES="YES" pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ + @pkg -o ABI_FILE=${DESTDIR}/bin/sh create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \ -r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \ -o ${DESTDIR}