The branch releng/13.0 has been updated by gjb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=4689ab1eab624d1a551a5a8f109383ea18eeba20
commit 4689ab1eab624d1a551a5a8f109383ea18eeba20
Author: Glen Barber <g...@freebsd.org>
AuthorDate: 2021-02-11 02:23:58 +0000
Commit: Glen Barber <g...@freebsd.org>
CommitDate: 2021-02-16 18:12:07 +0000
release: fix overriding UNAME_r
release.sh: fix OSVERSION and UNAME_r overrides
Add PBUILD_FLAGS and UNAME_r overrides to extra_chroot_setup()
to fix building ports for 14-CURRENT builds on 13.x.
Approved by: re (kib)
Sponsored by: Rubicon Communications, LLC ("Netgate")
(cherry picked from commit c511a5ab53ba335dc85f7ac93843872eb5763602)
(cherry picked from commit 6462113b7012025c2d88451c1795368ef0607deb)
(cherry picked from commit cc11afa865f0d5ff7cb22ef0656301e6efb6b3b2)
---
release/release.sh | 7 +++++++
release/tools/arm.subr | 4 ++++
2 files changed, 11 insertions(+)
diff --git a/release/release.sh b/release/release.sh
index 372f69177f7e..8294eaef6f00 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -308,7 +308,13 @@ extra_chroot_setup() {
GITUNSETOPTS="${GITUNSETOPTS} ICONV NLS P4 PERL"
GITUNSETOPTS="${GITUNSETOPTS} SEND_EMAIL SUBTREE SVN"
GITUNSETOPTS="${GITUNSETOPTS} PCRE PCRE2"
+ PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+ PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
+ PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
+ PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
eval chroot ${CHROOTDIR} env
OPTIONS_UNSET=\"${GITUNSETOPTS}\" \
+ ${PBUILD_FLAGS} \
make -C /usr/ports/devel/git
FORCE_PKG_REGISTER=1 \
WRKDIRPREFIX=/tmp/ports \
DISTDIR=/tmp/distfiles \
@@ -345,6 +351,7 @@ extra_chroot_setup() {
_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V
REVISION)
BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+ UNAME_r=${REVISION}-${BRANCH}
PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 1d4ae17d3851..343d9f3a7034 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -175,6 +175,10 @@ arm_install_base() {
if [ "${PART_SCHEME}" == "MBR" ]; then
chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${DESTDIR}
fi
+ _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
+ REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
+ BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
+ export UNAME_r=${REVISION}-${BRANCH}
eval chroot ${CHROOTDIR} make -C ${WORLDDIR} \
TARGET=${EMBEDDED_TARGET} \
TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
