From 1320c43d076c1dfc8165f96be1ee9df13a01c7ae Mon Sep 17 00:00:00 2001 From: Jeroen Ruigrok/asmodai Date: Sun, 25 Sep 2005 12:43:58 +0000 Subject: [PATCH] Add usr.bin/stat to bootstrap-tools: Make boot2 use stat for getting the filesize instead of ls. --- Makefile.inc1 | 4 ++-- sys/boot/i386/boot2/Makefile | 4 ++-- sys/boot/pc32/boot2/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d7b53f9a3f..7b3a0e7919 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.79 2005/09/06 18:55:15 dillon Exp $ +# $DragonFly: src/Makefile.inc1,v 1.80 2005/09/25 12:43:58 asmodai Exp $ # # Build-time options are documented in make.conf(5). # @@ -755,7 +755,7 @@ bootstrap-tools: bin/cat bin/ln bin/mv bin/csh bin/expr bin/sh bin/ls \ bin/hostname bin/kill \ usr.bin/yacc usr.bin/colldef usr.bin/uudecode usr.bin/xinstall \ - usr.bin/m4 usr.bin/rpcgen usr.bin/make usr.bin/awk \ + usr.bin/m4 usr.bin/rpcgen usr.bin/make usr.bin/awk usr.bin/stat \ usr.bin/find usr.bin/lex usr.bin/sed usr.bin/uname usr.bin/touch \ usr.bin/mkdep usr.bin/mktemp usr.bin/lorder usr.bin/file2c \ usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \ diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index cea7606227..a60ee3b24e 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/i386/boot2/Attic/Makefile,v 1.15 2005/08/02 13:03:54 joerg Exp $ +# $DragonFly: src/sys/boot/i386/boot2/Attic/Makefile,v 1.16 2005/09/25 12:43:58 asmodai Exp $ PROG= boot2 NOMAN= @@ -122,7 +122,7 @@ boot2.h: boot1.out bootasmdef.nx 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 diff --git a/sys/boot/pc32/boot2/Makefile b/sys/boot/pc32/boot2/Makefile index 60b4688036..eeb0a4d8e7 100644 --- a/sys/boot/pc32/boot2/Makefile +++ b/sys/boot/pc32/boot2/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/pc32/boot2/Makefile,v 1.15 2005/08/02 13:03:54 joerg Exp $ +# $DragonFly: src/sys/boot/pc32/boot2/Makefile,v 1.16 2005/09/25 12:43:58 asmodai Exp $ PROG= boot2 NOMAN= @@ -122,7 +122,7 @@ boot2.h: boot1.out bootasmdef.nx 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 -- 2.41.0