Remove redundant logic from the pkg-base merge.
These will be set from the logic right above it. Reviewed by: gjb Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
ae00149999
commit
59e2f057b6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=298417
@ -195,10 +195,6 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE
|
||||
.endif
|
||||
|
||||
.if !defined(PKG_VERSION)
|
||||
REVISION!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION
|
||||
BRANCH!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH
|
||||
SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
|
||||
${SRCDIR}/sys/sys/param.h
|
||||
.if ${BRANCH:MSTABLE*} || ${BRANCH:MCURRENT*}
|
||||
TIMENOW= %Y%m%d%H%M%S
|
||||
EXTRA_REVISION= .s${TIMENOW:gmtime}
|
||||
|
Loading…
Reference in New Issue
Block a user