arm/181220: make xdev for arm installation fails

[Christopher Abbey]

>Number:         181220
>Category:       arm
>Synopsis:       make xdev for arm installation fails
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-arm
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 11 01:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Christopher Abbey
>Release:        9.1
>Organization:
>Environment:
FreeBSD robolace.localdomain 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10 UTC 2012     root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
When building xdev:
    make XDEV=arm XDEV_ARCH=armv6 xdev

It fails with the output:

set -e; cd /usr/src/include; make buildincludes; make installincludes
creating osreldate.h from newvers.sh
*** [osreldate.h] Error code 1

Stop in /usr/src/include.
*** [includes] Error code 1

Stop in /usr/src/include.
*** [include.includes__D] Error code 1

Stop in /usr/src.
*** [_xi-includes] Error code 1

Stop in /usr/src.
*** [xdev] Error code 1

Stop in /usr/src.


The problem file appears to be:
/usr/src/sys/conf/newvers.sh

It looks like ${0} is printing sh instead of the script name
>How-To-Repeat:
make XDEV=arm XDEV_ARCH=armv6 xdev

>Fix:
Hard coding the script name into the script. 

Patch attached with submission follows:

--- newvers.sh.old	2013-08-11 11:10:22.000000000 +1000
+++ newvers.sh	2013-08-11 11:10:09.000000000 +1000
@@ -30,6 +30,7 @@
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
 # $FreeBSD: head/sys/conf/newvers.sh 254094 2013-08-08 15:59:00Z gjb $
 
+SCRIPT_NAME="/usr/src/sys/conf/newvers.sh"
 TYPE="FreeBSD"
 REVISION="10.0"
 BRANCH="CURRENT"
@@ -96,7 +97,7 @@
 		# Run svnversion from ${dir} on this script; if return code
 		# is not zero, the checkout might not be compatible with the
 		# svnversion being used.
-		${dir}/svnversion $(basename ${0}) >/dev/null 2>&1
+		${dir}/svnversion ${SCRIPT_NAME} >/dev/null 2>&1
 		if [ $? -eq 0 ]; then
 			svnversion=${dir}/svnversion
 			break
@@ -105,7 +106,7 @@
 done
 
 if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then
-	/usr/bin/svnversion $(basename ${0}) >/dev/null 2>&1
+	/usr/bin/svnversion ${SCRIPT_NAME} >/dev/null 2>&1
 	if [ $? -eq 0 ]; then
 		svnversion=/usr/bin/svnliteversion
 	else


>Release-Note:
>Audit-Trail:
>Unformatted: