Date: Tue, 16 Apr 2024 20:13:41 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 33d1ce86abcb - stable/14 - userboot: allow for overriding the version file location Message-ID: <202404162013.43GKDf0J040209@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33d1ce86abcb072bb0a9fb366aa91e888ea573f8 commit 33d1ce86abcb072bb0a9fb366aa91e888ea573f8 Author: Stephen J. Kiernan <stevek@FreeBSD.org> AuthorDate: 2024-04-03 21:22:01 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-04-16 19:54:30 +0000 userboot: allow for overriding the version file location Use ?= when assigning VERSION_FILE Reviewed by: imp Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44624 (cherry picked from commit 112783ebbc313f0df73bbec8520a94aba4a4f33d) --- stand/userboot/userboot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 15ac8701e4d4..4674672bbec5 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -44,7 +44,7 @@ CFLAGS.main.c+= -I${SYSDIR}/contrib/openzfs/include/os/freebsd/zfs CWARNFLAGS.main.c += -Wno-implicit-function-declaration NEWVERSWHAT= "User boot ${LOADER_INTERP}" ${MACHINE_CPUARCH} -VERSION_FILE= ${.CURDIR}/../userboot/version +VERSION_FILE?= ${.CURDIR}/../userboot/version .if ${LOADER_INTERP} == ${LOADER_DEFAULT_INTERP} LINKS+= ${BINDIR}/${SHLIB_NAME} ${BINDIR}/userboot.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404162013.43GKDf0J040209>