From owner-svn-src-projects@freebsd.org Fri Jan 29 17:05:31 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 679B6A7271E for ; Fri, 29 Jan 2016 17:05:31 +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 3B0601A5A; Fri, 29 Jan 2016 17:05:31 +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 u0TH5UPJ072290; Fri, 29 Jan 2016 17:05:30 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0TH5URH072289; Fri, 29 Jan 2016 17:05:30 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201601291705.u0TH5URH072289@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 29 Jan 2016 17:05:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295044 - 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, 29 Jan 2016 17:05:31 -0000 Author: gjb Date: Fri Jan 29 17:05:30 2016 New Revision: 295044 URL: https://svnweb.freebsd.org/changeset/base/295044 Log: Reorder execution in the 'packages' target so both userland and kernel are staged before invoking the 'create--packages' targets. Include PKG_VERSION value in the 'create-{world,kernel}-packages' targets so the value is not redefined when packaging the kernel, which otherwise results in inconsistent and confusing package version results. Sponsored by: The FreeBSD Foundation Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Fri Jan 29 16:42:03 2016 (r295043) +++ projects/release-pkg/Makefile.inc1 Fri Jan 29 17:05:30 2016 (r295044) @@ -1379,9 +1379,9 @@ packages: _pkgbootstrap @mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${REPODIR} ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \ - ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} create-world-packages ; \ ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel ; \ - ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} DISTDIR=kernel create-kernel-packages + ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} PKG_VERSION=${PKG_VERSION} create-world-packages ; \ + ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} PKG_VERSION=${PKG_VERSION} DISTDIR=kernel create-kernel-packages create-world-packages: _pkgbootstrap @rm -f ${DESTDIR}/*.plist 2>/dev/null || :