summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorcperciva <cperciva@FreeBSD.org>2013-11-13 08:08:56 +0000
committercperciva <cperciva@FreeBSD.org>2013-11-13 08:08:56 +0000
commitc917df04fa3c99b581e7548f4b0bd7a5db94454b (patch)
tree19aec2b484d4401f35516226636e3f8e28584955 /Makefile.inc1
parentbbc934705aa7e4fab75f3d6bf64167bf4d843925 (diff)
downloadFreeBSD-src-c917df04fa3c99b581e7548f4b0bd7a5db94454b.zip
FreeBSD-src-c917df04fa3c99b581e7548f4b0bd7a5db94454b.tar.gz
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
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc12
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 862f827..a592034 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
OpenPOWER on IntegriCloud