release build breaks in src/release/scripts/split-file.sh

[Ruslan Ermilov]

On Thu, Sep 09, 2004 at 09:59:29AM +0200, Ruben de Groot wrote:
> 
> I can't successfully build a release of RELENG_5 on my build machine 
> (releng_5_2, releng_5_1 and releng_4 are OK) because of an issue with
> /bin/sh manifesting itself in the split-file.sh script. Here's the
> problem:
> 
> $ uname -r	# this is the build machine
> 5.1-RELEASE-p16
> $ i=1
> $ i=$((i + 1))
> arith: syntax error: "i + 1"
> 
> $ uname -r
> 5.3-ALPHA
> $ i=1
> $ i=$((i + 1))
> $ echo $i
> 2
> 
> Is this a known issue and has anyone got a workaround for this (I can't
> upgrade the build machine, at least not a.t.m.)
> 
Yes.  This has been fixed in HEAD on August 26.

re@, should I MFC this into RELENG_5?

%%%
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.853.2.1
diff -u -r1.853.2.1 Makefile
--- Makefile	29 Aug 2004 05:37:20 -0000	1.853.2.1
+++ Makefile	9 Sep 2004 08:22:07 -0000
@@ -1081,7 +1081,7 @@
 	    ${RD}/floppyset/${FLOPPYBASE} ${FLPSPLITSIZE} "${FLOPPYDESC}"
 	( splitfile=${SPLITDIR}/`basename ${SPLITFILE}`.split ; \
 	lines=`cat $${splitfile} | wc -l`; \
-	lines=$$((lines - 1)) ; \
+	lines=$$(($$lines - 1)) ; \
 	for line in `jot $$lines`; do \
 		file=`head -n $$(($${line} + 1)) $${splitfile} | tail -1 | cut -f 1 -d ' '` ; \
 		sh -e ${DOFS_SH} ${RD}/floppies/${FLOPPYBASE}$${line}.flp \
Index: scripts/split-file.sh
===================================================================
RCS file: /home/ncvs/src/release/scripts/split-file.sh,v
retrieving revision 1.1
diff -u -r1.1 split-file.sh
--- scripts/split-file.sh	26 Jan 2004 19:45:09 -0000	1.1
+++ scripts/split-file.sh	9 Sep 2004 08:22:14 -0000
@@ -35,5 +35,5 @@
 i=1
 for file in ${files}; do
 	echo `basename ${file}` "\"${DESCR} floppy ${i}\"" >> ${DEST}/${prefix}.split
-	i=$((i + 1))
+	i=$(($i + 1))
 done
%%%


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20040909/653606e5/attachment.bin