From bb364f9cc8fa9d695aee0b326d864e2ffa2d4dd6 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Wed, 15 Feb 2012 01:19:12 +0100
Subject: [PATCH] simplify chrootmake.sh

	. just use make world
---
 etc/mtree/minix.tree |  1 +
 tools/chrootmake.sh  | 18 +++---------------
 tools/mkboot         |  2 +-
 tools/release.sh     |  8 ++++----
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index 15feb4c78..8d064092a 100644
--- a/etc/mtree/minix.tree
+++ b/etc/mtree/minix.tree
@@ -7,6 +7,7 @@
 755 root    operator /etc/defaults
 755 root    operator /etc/system.conf.d
 755 root    operator /boot
+755 root    operator /boot/minix_default
 755 root    operator /boot/minix
 555 root    operator /mnt
 555 root    operator /proc
diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index c4f6422e1..444d33f5d 100755
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -7,23 +7,11 @@ if [ $# -gt 0 ]
 then	make $@
 	exit $?
 fi
-
 make world
+cp /usr/mdec/boot_monitor /
+cp /boot/minix_latest/* /boot/minix_default/
 
-cd tools 
-rm revision
-make install
-
-make cleandepend clean depend image
-rm revision
-rm -rf /boot/minix/* # on old systems might not be present
-make install
-cp ../sys/arch/i386/stand/boot/biosboot/boot_monitor /
-cp -rf /boot/minix/* /boot/minix_default
-
-cd /usr/src 
 if [ $MAKEMAP -ne 0 ]; then
 	find . -type f -perm 755 | xargs nm -n 2> /dev/null > symbols.txt
 fi
-make clean
-make cleandepend
+make clean cleandepend
diff --git a/tools/mkboot b/tools/mkboot
index 2c4f07b4e..0389cb707 100755
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -128,7 +128,7 @@ hdboot)
 		[ -d /boot/minix/.temp ] || exit 1
 		mv /boot/minix/.temp /boot/minix/"$target"
 		rm -f /boot/minix_latest
-		ln -s /boot/minix/"$target" /boot/minix_latest 
+		ln -s minix/"$target" /boot/minix_latest 
 	else
 		# Install the new image.
 		echo "install $hdboot_t $root:/boot/$hdboot_t/$target"
diff --git a/tools/release.sh b/tools/release.sh
index 519494c93..846bf0474 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -241,6 +241,7 @@ mkdir -p $RELEASEDIR/usr/share/mk
 chmod 755 $RELEASEDIR/usr/share/mk
 cp $RELEASEDIR/usr/src/share/mk/* $RELEASEDIR/usr/share/mk/
 chown -R root $RELEASEDIR/usr/share/mk
+rm -f $RELEASEDIR/usr/$SRC/tools/revision
 cp chrootmake.sh $RELEASEDIR/usr/$SRC/tools/chrootmake.sh
 
 echo " * Make hierarchy"
@@ -255,6 +256,8 @@ if [ "$CUSTOM_PACKAGES" ]
 then	echo $PKG_ADD_URL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf
 fi
 
+echo " * Resetting timestamps"
+find $RELEASEDIR | xargs touch
 echo " * Chroot build"
 chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1
 echo " * Chroot build done"
@@ -264,9 +267,6 @@ rm -rf $RELEASEDIR/$XBIN
 chown -R root $RELEASEDIR/usr/src*
 cp issue.install $RELEASEDIR/etc/issue
 
-echo " * Resetting timestamps"
-find $RELEASEDIR | xargs touch
-
 echo $version_pretty, SVN revision $REVISION, generated `date` >$RELEASEDIR/etc/version
 rm -rf $RELEASEDIR/tmp/*
 
@@ -373,7 +373,7 @@ if [ "$USB" -ne 0 ]; then
 	mv $bootimage $IMG
 else
 	cp $RELEASEDIR/usr/mdec/boot_monitor $CDFILES/boot
-	cp -rf $RELEASEDIR/boot/minix_default/* $CDFILES/
+	cp -rf $RELEASEDIR/boot/minix_latest/* $CDFILES/
 	writeisofs -s0x0 -l MINIX -B $bootimage $boottype $CDFILES $IMG || exit 1
 
 	if [ "$HDEMU" -eq 0 ]
-- 
2.44.0