system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 18:56:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Avoid the build from falling over if devel/git is not installed

Browse source 
on the system.  Set a null branch/hash in this case, to avoid
undefined GITREV/GITBRANCH variables from falling over in other
areas.

Reported by:	many
Sponsored by:	Rubicon Communications, LLC (netgate.com)
This commit is contained in:
Glen Barber 2020-08-29 15:30:21 +00:00
parent 8f82b5d4e3
commit 52a8a2de0f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364957
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
release/Makefile.inc1
View file

@ -10,10 +10,8 @@ GIT_CMD= ${_P}/git
. endif
. endif
.endfor
.if !defined(GIT_CMD) && empty(GIT_CMD)
. error "Git binary not found. Set GIT_CMD appropriately."
.endif
.if !empty(GIT_CMD) && exists(${GIT_CMD})
# Set the git branch and hash to export where needed.
.if !defined(GITBRANCH) || empty(GITBRANCH)
GITBRANCH!= ${GIT_CMD} -C ${.CURDIR} rev-parse --abbrev-ref HEAD 2>/dev/null | sed -e 's/\^\///'
@ -23,6 +21,12 @@ GITBRANCH!= ${GIT_CMD} -C ${.CURDIR} rev-parse --abbrev-ref HEAD 2>/dev/null | s
GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD 2>/dev/null || true
.export GITREV
.endif
.else
GITBRANCH= nullbranch
GITREV= nullhash
.export GITBRANCH
.export GITREV
.endif
# Set the build date, primarily for snapshot builds.
.if !defined(BUILDDATE) || empty(BUILDDATE)