Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Apr 2024 05:44:05 GMT
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f1c7e9bc7233 - stable/14 - release: Build dvd image before staging pkgs
Message-ID:  <202404170544.43H5i5KD007185@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=f1c7e9bc72336602e4a147757488794f139f8510

commit f1c7e9bc72336602e4a147757488794f139f8510
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-04-14 22:31:26 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-04-17 05:43:27 +0000

    release: Build dvd image before staging pkgs
    
    This missing dependency is only visible with -jN (which was otherwise
    broken until recently) and only when building DVD images (which aren't
    included in weekly snapshots and thereby slipped past testing).
    
    MFC after:      3 days
    
    (cherry picked from commit 567cbd8ff1c4edc1f2015ec4f93608aaf5a3c546)
---
 release/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/Makefile b/release/Makefile
index 7b658bb90b29..ba9499ac5a3f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -300,7 +300,7 @@ packagesystem: ${DISTRIBUTIONS}
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}
 
-pkg-stage:
+pkg-stage: dvd
 # TODO: Support for -DNO_ROOT
 .if !defined(NOPKG) || empty(NOPKG)
 	env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404170544.43H5i5KD007185>