git: 271e14722983 - stable/15 - release: GCE builds depend on ftp
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 05 Nov 2025 22:03:30 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=271e14722983f73dbe02a31bb92ee095356e802e
commit 271e14722983f73dbe02a31bb92ee095356e802e
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-11-03 21:41:14 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-11-05 22:03:21 +0000
release: GCE builds depend on ftp
GCE images are required by Google to include their source code; we do
this by extracting {src,ports}.txz into the images, from the (legacy)
distribution sets.
Make sure those distribution sets actually exist.
Reviewed by: ivy
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D53567
(cherry picked from commit 7f536b1c1146c4bc5cde336e1fe7a083f2874f11)
---
release/Makefile.vm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index a04f779ebebb..142fd6e7bdf5 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -129,6 +129,13 @@ ${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE= ${_CW:tl}.${_FS}.${_FMT}
cw-${_CW:tl}-${_FS}-${_FMT}: cw-ec2-base-${_FS}-${_FMT}
.endif
+# Special handling: GCE images ingest src.txz and ports.txz and expect them
+# to be in the /ftp/ directory. Note: This will need to be reworked before
+# distribution sets go away!
+.if ${_CW} == GCE
+cw-${_CW:tl}-${_FS}-${_FMT}: ftp
+.endif
+
cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR}
mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \