From 484ab7255a81380698bea7db035083b919b2f541 Mon Sep 17 00:00:00 2001
From: cperciva <cperciva@FreeBSD.org>
Date: Sun, 24 Nov 2013 23:30:23 +0000
Subject: MFC r258086:   Strip the -pN patch level from the VERSION string
 which gets encoded into   CTF data.  Otherwise FreeBSD Update builds think
 every kernel file has   changed every time there's a security advisory, since
 the FreeBSD Update   build code isn't smart enough to look inside CTF data to
 ignore those   changes.

Approved by:	re (gjb)
---
 Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.inc1')

diff --git a/Makefile.inc1 b/Makefile.inc1
index 4114b7b..2285c89 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -133,7 +133,7 @@ REVISION!=	make -C ${SRCDIR}/release -V REVISION
 BRANCH!=	make -C ${SRCDIR}/release -V BRANCH
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		${SRCDIR}/sys/sys/param.h
-VERSION=	FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE}
+VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
 KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
-- 
cgit v1.1