From owner-svn-src-projects@freebsd.org Mon Feb 8 16:08:15 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 1F71FAA28A6 for ; Mon, 8 Feb 2016 16:08:15 +0000 (UTC) (envelope-from des@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 CC97C1947; Mon, 8 Feb 2016 16:08:14 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u18G8DHm044256; Mon, 8 Feb 2016 16:08:13 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u18G8DIP044254; Mon, 8 Feb 2016 16:08:13 GMT (envelope-from des@FreeBSD.org) Message-Id: <201602081608.u18G8DIP044254@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Mon, 8 Feb 2016 16:08:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295396 - 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: Mon, 08 Feb 2016 16:08:15 -0000 Author: des Date: Mon Feb 8 16:08:13 2016 New Revision: 295396 URL: https://svnweb.freebsd.org/changeset/base/295396 Log: Split the packages target into stage-packages and create-packages to make it possible to roll new packages from an existing build without having to restage them. Modified: projects/release-pkg/Makefile projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile ============================================================================== --- projects/release-pkg/Makefile Mon Feb 8 14:27:45 2016 (r295395) +++ projects/release-pkg/Makefile Mon Feb 8 16:08:13 2016 (r295396) @@ -126,8 +126,9 @@ TGTS= all all-man buildenv buildenvvars _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ - xdev-links native-xtools create-kernel-packages stageworld stagekernel \ - create-world-packages packages installconfig signpackages + xdev-links native-xtools stageworld stagekernel stage-packages \ + create-world-packages create-kernel-packages create-packages \ + packages installconfig signpackages TGTS+= ${SUBDIR_TARGETS} Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Mon Feb 8 14:27:45 2016 (r295395) +++ projects/release-pkg/Makefile.inc1 Mon Feb 8 16:08:13 2016 (r295396) @@ -1374,11 +1374,17 @@ _pkgbootstrap: @env ASSUME_ALWAYS_YES=YES pkg bootstrap .endif -packages: _pkgbootstrap - @mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${REPODIR} +packages: stage-packages create-packages + +stage-packages: + @mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \ - ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel ; \ + ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel + +create-packages: _pkgbootstrap + @mkdir -p ${REPODIR} + ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} \ PKG_VERSION=${PKG_VERSION} create-world-packages ; \ ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} \