From owner-freebsd-current@FreeBSD.ORG Thu Sep 9 08:36:53 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2C6E016A4CE; Thu, 9 Sep 2004 08:36:53 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11CF043D39; Thu, 9 Sep 2004 08:36:52 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i898aemM007573 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 9 Sep 2004 11:36:40 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i898ah1W044368; Thu, 9 Sep 2004 11:36:43 +0300 (EEST) (envelope-from ru) Date: Thu, 9 Sep 2004 11:36:42 +0300 From: Ruslan Ermilov To: Ruben de Groot , freebsd-current@freebsd.org Message-ID: <20040909083641.GA44288@ip.net.ua> Mail-Followup-To: Ruslan Ermilov , Ruben de Groot , freebsd-current@freebsd.org References: <20040909075928.GA50494@ei.bzerk.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9amGYk9869ThD9tj" Content-Disposition: inline In-Reply-To: <20040909075928.GA50494@ei.bzerk.org> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new cc: re@freebsd.org Subject: Re: release build breaks in src/release/scripts/split-file.sh X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2004 08:36:53 -0000 --9amGYk9869ThD9tj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 09, 2004 at 09:59:29AM +0200, Ruben de Groot wrote: >=20 > I can't successfully build a release of RELENG_5 on my build machine=20 > (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: >=20 > $ uname -r # this is the build machine > 5.1-RELEASE-p16 > $ i=3D1 > $ i=3D$((i + 1)) > arith: syntax error: "i + 1" >=20 > $ uname -r > 5.3-ALPHA > $ i=3D1 > $ i=3D$((i + 1)) > $ echo $i > 2 >=20 > 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.) >=20 Yes. This has been fixed in HEAD on August 26. re@, should I MFC this into RELENG_5? %%% Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=3D${SPLITDIR}/`basename ${SPLITFILE}`.split ; \ lines=3D`cat $${splitfile} | wc -l`; \ - lines=3D$$((lines - 1)) ; \ + lines=3D$$(($$lines - 1)) ; \ for line in `jot $$lines`; do \ file=3D`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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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=3D1 for file in ${files}; do echo `basename ${file}` "\"${DESCR} floppy ${i}\"" >> ${DEST}/${prefix}.s= plit - i=3D$((i + 1)) + i=3D$(($i + 1)) done %%% Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --9amGYk9869ThD9tj Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBQBYZqRfpzJluFF4RAgFNAJ9xEffAY/VYUkbDBASlapvJvc39BQCfTvKS vsjVOPGo3xYKIMMUg19wz3M= =KJBz -----END PGP SIGNATURE----- --9amGYk9869ThD9tj--