From 0d9095d116dc10661a3086029cf777c1eb648f6f Mon Sep 17 00:00:00 2001
From: Arun Thomas <arun@minix3.org>
Date: Wed, 20 Jul 2011 10:19:28 +0200
Subject: [PATCH] Fix ISO building

-Update release.sh to use new stat syntax
-Add missing utils to release bootstrap dirs
-Remove needless dependency in ramdisk Makefile
---
 drivers/ramdisk/Makefile | 3 +--
 tools/release.sh         | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index 9e044cdc1..59ed1d94f 100644
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -18,7 +18,6 @@ STRIPFLAG+= -s
 EXTRA=system.conf passwd rs.single
 
 CPPFLAGS+= -I${MINIXSRCDIR}/servers -I${MINIXSRCDIR}
-MAKEDEV=/usr/bin/MAKEDEV
 CLEANFILES += $(PROGRAMS) $(SCRIPTS) $(EXTRA) bintoc image image.c t proto.gen
 
 install: all
@@ -147,7 +146,7 @@ passwd: ../../etc/passwd
 rs.single: ../../etc/rs.single
 	install ${STRIPFLAG} ../../etc/$@ $@
 
-proto.gen: $(PROGRAMS) $(SCRIPTS) $(MAKEDEV) proto.sh proto
+proto.gen: $(PROGRAMS) $(SCRIPTS) proto.sh proto
 	sh -e proto.sh >proto.gen
 
 .if ${OBJECT_FMT} == "ELF"
diff --git a/tools/release.sh b/tools/release.sh
index b227bc0af..948e826fa 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -192,8 +192,9 @@ mkdir -p $RELEASEPACKAGE
 echo " * Transfering bootstrap dirs to $RELEASEDIR"
 cp -p /bin/* /usr/bin/* /sbin/* $RELEASEDIR/$XBIN
 cp -rp /usr/lib $RELEASEDIR/usr
-cp -rp /bin/sh /bin/echo /bin/install /bin/rm $RELEASEDIR/bin
-cp -rp /usr/bin/make /usr/bin/yacc /usr/bin/lex /usr/bin/asmconv $RELEASEDIR/usr/bin
+cp -rp /bin/sh /bin/echo /bin/install /bin/rm /bin/sed $RELEASEDIR/bin
+cp -rp /usr/bin/make /usr/bin/yacc /usr/bin/lex /usr/bin/asmconv \
+	/usr/bin/grep /usr/bin/egrep /usr/bin/awk $RELEASEDIR/usr/bin
 
 CONFIGHEADER=$RELEASEDIR/usr/src/common/include/minix/sys_config.h
 
@@ -387,7 +388,7 @@ else
 	then
 		echo "Appending Minix root and usr filesystem"
 		# Pad ISO out to cylinder boundary
-		isobytes=`stat -size $IMG`
+		isobytes=`stat -f %z $IMG`
 		isosects=`expr $isobytes / 512`
 		isopad=`expr $secs - '(' $isosects % $secs ')'`
 		dd if=/dev/zero count=$isopad >>$IMG
-- 
2.44.0