git: e64eb9ea0f4c - main - release: Respect NODISTSETS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Oct 2025 00:36:28 UTC
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=e64eb9ea0f4c88a9fa32ae3ae517cbe15a193a08
commit e64eb9ea0f4c88a9fa32ae3ae517cbe15a193a08
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-10-03 23:56:53 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-03 23:56:53 +0000
release: Respect NODISTSETS
In addition to not putting distribution sets onto ISO images, if
NODISTSETS is set then we should not build the distribution sets
or put them onto the "FTP" site (aka download.freebsd.org).
MFC after: 3 days
Sponsored by: https://www.patreon.com/cperciva
---
release/Makefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/release/Makefile b/release/Makefile
index 8616d3817dd9..dcff6855db50 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -116,7 +116,10 @@ DISTRIBUTIONS+= ports.txz
DISTRIBUTIONS+= src.txz
.endif
-RELEASE_TARGETS= ftp
+RELEASE_TARGETS=
+.if !defined(NODISTSETS) || empty(NODISTSETS)
+RELEASE_TARGETS+= ftp
+.endif
IMAGES=
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
RELEASE_TARGETS+= cdrom
@@ -449,7 +452,9 @@ release-install:
.if defined(DESTDIR) && !empty(DESTDIR)
mkdir -p ${DESTDIR}
.endif
+.if !defined(NODISTSETS) || empty(NODISTSETS)
cp -a ftp ${DESTDIR}/
+.endif
.if !empty(IMAGES)
.for I in ${IMAGES}
cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}