Date: Sat, 14 Aug 2021 04:52:24 GMT From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 259478fc3ad5 - main - Mk/bsd.port.mk: Revert the UNAME_r error text change for now. Message-ID: <202108140452.17E4qO7o086360@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=259478fc3ad59d7e867884b85b6158345d39049c commit 259478fc3ad59d7e867884b85b6158345d39049c Author: Bryan Drewery <bdrewery@FreeBSD.org> AuthorDate: 2021-08-14 04:50:52 +0000 Commit: Bryan Drewery <bdrewery@FreeBSD.org> CommitDate: 2021-08-14 04:52:22 +0000 Mk/bsd.port.mk: Revert the UNAME_r error text change for now. Keep the new flag though. This error can occur in some other cases such as building on a mismatched host kernel+userland. Some further study is needed and it may be possible to automatically set UNAME_r. --- Mk/bsd.port.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 261a775219fb..7675c4b53691 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1195,10 +1195,8 @@ _OSVERSION_MAJOR= ${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/} # Skip if OSVERSION specified on cmdline for testing. Only works for bmake. .if !defined(.MAKEOVERRIDES) || !${.MAKEOVERRIDES:MOSVERSION} .if ${_OSVERSION_MAJOR} != ${_OSRELEASE:R} -.if defined(I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE) -WARNING+= "I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE set: Expect unexpected problems as the chroot/jail file versions do not match what `uname` returns. Thus builds may target the wrong release if they use `uname`." -.else -.error UNAME_r (${_OSRELEASE}) and OSVERSION (${OSVERSION}) do not agree on major version number: This means your jail or chroot is misconfigured such that the installed files (OSVERION) do not match what `uname -r` (kernel) returns. Likely setting UNAME_r will resolve the issue. OSVERSION should not be set as it will be read from /usr/include/sys/param.h. +.if !defined(I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE) +.error UNAME_r (${_OSRELEASE}) and OSVERSION (${OSVERSION}) do not agree on major version number. .endif .elif ${_OSVERSION_MAJOR} != ${OSREL:R} .error OSREL (${OSREL}) and OSVERSION (${OSVERSION}) do not agree on major version number.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108140452.17E4qO7o086360>