mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Avoid the build from falling over if devel/git is not installed
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:
parent
8f82b5d4e3
commit
52a8a2de0f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=364957
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue