Permalink
Browse files

Allow the path to the system source directory to be passed in to

newvers.sh.  Pass it in from include/Makefile.  If it isn't passed in,
fall back to the old logic of using dirname $0.

Using dirname $0 does not yield the path to the script if it was
sourced in from another script in another directory; you end up with
the parent script's path.  That was causing newvers.sh to look one
level below the FreeBSD src/ directory when building osreldate.h and it
may find something like a git or svn repo there that has nothing to do
with FreeBSD.

PR:		174422
Approved by:	re ()
MFC after:	2 weeks
  • Loading branch information...
1 parent 76fc3e6 commit 797b9c8d73c61673ccff89e5a1134ae939515682 ian committed Sep 28, 2013
Showing with 8 additions and 3 deletions.
  1. +4 −2 include/Makefile
  2. +4 −1 sys/conf/newvers.sh
View
@@ -104,15 +104,17 @@ SHARED?= copies
INCS+= osreldate.h
-NEWVERS_SH= ${.CURDIR}/../sys/conf/newvers.sh
-PARAM_H= ${.CURDIR}/../sys/sys/param.h
+SYSDIR= ${.CURDIR}/../sys
+NEWVERS_SH= ${SYSDIR}/conf/newvers.sh
+PARAM_H= ${SYSDIR}/sys/param.h
MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
env ECHO="${ECHO}" \
MAKE="${MAKE}" \
NEWVERS_SH=${NEWVERS_SH} \
PARAM_H=${PARAM_H} \
+ SYSDIR=${SYSDIR} \
sh ${MK_OSRELDATE_SH}
.for i in ${LHDRS}
View
@@ -38,7 +38,10 @@ if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
fi
RELEASE="${REVISION}-${BRANCH}"
VERSION="${TYPE} ${RELEASE}"
-SYSDIR=$(dirname $0)/..
+
+if [ "X${SYSDIR}" = "X" ]; then
+ SYSDIR=$(dirname $0)/..
+fi
if [ "X${PARAMFILE}" != "X" ]; then
RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \

0 comments on commit 797b9c8

Please sign in to comment.