svn commit: r258086 - head

[Colin Percival]

Author: cperciva
Date: Wed Nov 13 08:08:56 2013
New Revision: 258086
URL: http://svnweb.freebsd.org/changeset/base/258086

Log:
  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

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Nov 13 07:09:00 2013	(r258085)
+++ head/Makefile.inc1	Wed Nov 13 08:08:56 2013	(r258086)
@@ -136,7 +136,7 @@ REVISION!=	make -C ${SRCDIR}/release -V 
 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