svn commit: r258536 - stable/10

[Colin Percival]

Author: cperciva
Date: Sun Nov 24 23:30:23 2013
New Revision: 258536
URL: http://svnweb.freebsd.org/changeset/base/258536

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

Modified:
  stable/10/Makefile.inc1   (contents, props changed)

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Sun Nov 24 23:12:13 2013	(r258535)
+++ stable/10/Makefile.inc1	Sun Nov 24 23:30:23 2013	(r258536)
@@ -133,7 +133,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