Re: Fwd: DragonFly ISO release build failure for 2CSNAP-20050923-2330-Devel

[Jeroen Ruigrok/asmodai <asmodai@xxxxxxxxxxxxx>]

-On [20050924 16:34], Simon 'corecode' Schubert (corecode@xxxxxxxxxxxx) wrote:
>It's not about "early", it's about "anywhere".  And at the moment ls is 
>being used (at least) in sys/boot/i386/boot2/Makefile, 
>lib/libcompat/i386/Makefile and in sys/conf/Makefile*

You sure about libcompat/i386?

It doesn't exist in my source tree how hard I try.

And both others were 1 minute fixes.

Try the attached patch.

-- 
Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai / kita no mono
Free Tibet! http://www.savetibet.org/ | http://www.andf.info/
http://www.tendra.org/   | http://www.in-nomine.org/
Cogito, ergo sum...

Index: src/sys/boot/i386/boot2/Makefile
===================================================================
RCS file: /home/ncvs/DragonFly/src/sys/boot/i386/boot2/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- src/sys/boot/i386/boot2/Makefile	2 Aug 2005 13:03:54 -0000	1.15
+++ src/sys/boot/i386/boot2/Makefile	24 Sep 2005 15:02:44 -0000
@@ -122,7 +122,7 @@
 boot2: boot2.ldr boot2.bin ${BTX}/btx/btx
 	btxld -v -E ${ORG2} -f bin -b ${BTX}/btx/btx -l boot2.ldr \
 		-o boot2.ld -P 1 boot2.bin
-	@ls -l boot2.ld | awk '{ x = 7680 - $$5; \
+	@stat boot2.ld | awk '{ x = 7680 - $$8; \
 		print x " bytes available"; if (x < 0) exit 1 }'
 	dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync 2>/dev/null
 
Index: src/sys/conf/Makefile.i386
===================================================================
RCS file: /home/ncvs/DragonFly/src/sys/conf/Makefile.i386,v
retrieving revision 1.23
diff -u -r1.23 Makefile.i386
--- src/sys/conf/Makefile.i386	17 Aug 2005 02:51:45 -0000	1.23
+++ src/sys/conf/Makefile.i386	24 Sep 2005 15:22:58 -0000
@@ -302,7 +302,7 @@
 #
 modules-install:
 .if !defined(NO_MODULES_OLD)
-	if [ -d ${DESTDIR}/modules -a -n "`ls ${DESTDIR}/modules`" ]; then \
+	if [ -d ${DESTDIR}/modules -a -n "`echo ${DESTDIR}/modules/*`" ]; then \
 		mkdir -p ${DESTDIR}/modules.old; \
 		for file in ${DESTDIR}/modules/*; do \
 		${OBJCOPY} --strip-debug $$file ${DESTDIR}/modules.old/$${file##*/}; \