Prevent the set -e from mk-osreldate.sh from propagating into newvers.sh.
This would cause detection of old versions of SVN to cause fatal errors instead of being caught and handled, which would make the build fail if the tree had been checked out with an older version of SVN (e.g. 1.6). Discussed with: gjb Approved by: re (marius)
This commit is contained in:
parent
b49bf73f75
commit
36ddc86874
@ -36,7 +36,9 @@ trap "rm -f $tmpfile" EXIT
|
||||
${ECHO} creating osreldate.h from newvers.sh
|
||||
|
||||
export PARAMFILE="${PARAM_H:=$CURDIR/../sys/sys/param.h}"
|
||||
. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}"
|
||||
set +e
|
||||
. "${NEWVERS_SH:=$CURDIR/../sys/conf/newvers.sh}" || exit 1
|
||||
set -e
|
||||
cat > $tmpfile <<EOF
|
||||
$COPYRIGHT
|
||||
#ifdef _KERNEL
|
||||
|
Loading…
Reference in New Issue
Block a user