git: e02775bf0470 - stable/15 - release: Pass ABI to running pkgbase-stage on dvd
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 20 Sep 2025 23:27:56 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=e02775bf04704dcaf9ee70caec2027c455233cd3
commit e02775bf04704dcaf9ee70caec2027c455233cd3
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-09-16 01:04:56 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-09-20 13:50:55 +0000
release: Pass ABI to running pkgbase-stage on dvd
I did this for disc1 but forgot to amend the dvd invocation.
Fixes: 340e68fd7c0d ("release: Pass ABI to pkgbase-stage.lua")
MFC after: 3 days
Sponsored by: https://www.patreon.com/cperciva
(cherry picked from commit b050bfa88d4ee2acedb590777603e5c3656cdaca)
---
release/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/release/Makefile b/release/Makefile
index d67bbb774062..7f4ae01fdc5c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -307,7 +307,7 @@ dvd: ${PKGBASE_REPO}
${.CURDIR}/scripts/pkgbase-stage.lua dvd \
${.OBJDIR}/pkgbase-repo/${PKG_ABI}/latest \
${.TARGET}/usr/freebsd-packages/offline \
- "${_ALL_libcompats}"
+ "${_ALL_libcompats}" ${PKG_ABI}
cp ${.CURDIR}/scripts/FreeBSD-base-offline.conf \
${.TARGET}/usr/freebsd-packages/repos/
mtree -c -p ${.TARGET}/usr/freebsd-packages | \