Module Name: src Committed By: justin Date: Sun Aug 3 13:14:59 UTC 2014
Modified Files: src/sys/conf: newvers.sh Log Message: Work around escaping issues with quotes in substitutions, to fix cross builds To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/conf/newvers.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/conf/newvers.sh diff -u src/sys/conf/newvers.sh:1.60 src/sys/conf/newvers.sh:1.61 --- src/sys/conf/newvers.sh:1.60 Sun Aug 3 09:13:11 2014 +++ src/sys/conf/newvers.sh Sun Aug 3 13:14:59 2014 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: newvers.sh,v 1.60 2014/08/03 09:13:11 apb Exp $ +# $NetBSD: newvers.sh,v 1.61 2014/08/03 13:14:59 justin Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 # The Regents of the University of California. All rights reserved. @@ -209,6 +209,9 @@ buildinfo_source="$(printf "%b" "${BUILD # Increment the serial number in the version file echo $(expr ${v} + 1) > version +# work around escaping issues with different shells +emptyq='""' + cat << _EOF > vers.c /* * Automatically generated file from $0 @@ -224,7 +227,7 @@ const char ostype[] = "${ost}"; const char osrelease[] = "${osr}"; const char sccs[] = "@(#)" ${fullversion_source}; const char version[] = ${fullversion_source}; -const char buildinfo[] = ${buildinfo_source:-\"\"}; +const char buildinfo[] = ${buildinfo_source:-${emptyq}}; const char kernel_ident[] = "${id}"; const char copyright[] = ${copyright_source}; _EOF