From d8efce392175a15f81278b882b2dc64a47ec9af4 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 13 Nov 2013 08:08:56 +0000
Subject: [PATCH] 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.

Pointy hat to:	cperciva
MFC after:	1 day, or before the next BETA
---
 Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 862f8279f1f0..a592034cf97b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -136,7 +136,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