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:

Bryan Drewery

2016-04-21 16:30:28 +00:00

parent ae00149999

commit 59e2f057b6

1 changed files with 0 additions and 4 deletions

									
										Makefile.inc1
									
		-4
	
												View File
												
				@@ -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}