sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

simplify chrootmake.sh

Browse source 
. just use make world
This commit is contained in:
Ben Gras 2012-02-15 01:19:12 +01:00
parent 342171fa9e
commit bb364f9cc8
4 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
etc/mtree/minix.tree
View file

@ -7,6 +7,7 @@
755 root operator /etc/defaults 755 root operator /etc/defaults
755 root operator /etc/system.conf.d 755 root operator /etc/system.conf.d
755 root operator /boot 755 root operator /boot
755 root operator /boot/minix_default
755 root operator /boot/minix 755 root operator /boot/minix
555 root operator /mnt 555 root operator /mnt
555 root operator /proc 555 root operator /proc

18
tools/chrootmake.sh
View file

@ -7,23 +7,11 @@ if [ $# -gt 0 ]
then make $@ then make $@
exit $? exit $?
fi fi
make world 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 if [ $MAKEMAP -ne 0 ]; then
find . -type f -perm 755 | xargs nm -n 2> /dev/null > symbols.txt find . -type f -perm 755 | xargs nm -n 2> /dev/null > symbols.txt
fi fi
make clean make clean cleandepend
make cleandepend

2
tools/mkboot
View file

@ -128,7 +128,7 @@ hdboot)
[ -d /boot/minix/.temp ] || exit 1 [ -d /boot/minix/.temp ] || exit 1
mv /boot/minix/.temp /boot/minix/"$target" mv /boot/minix/.temp /boot/minix/"$target"
rm -f /boot/minix_latest rm -f /boot/minix_latest
ln -s /boot/minix/"$target" /boot/minix_latest ln -s minix/"$target" /boot/minix_latest
else else
# Install the new image. # Install the new image.
echo "install $hdboot_t $root:/boot/$hdboot_t/$target" echo "install $hdboot_t $root:/boot/$hdboot_t/$target"

8
tools/release.sh
View file

@ -241,6 +241,7 @@ mkdir -p $RELEASEDIR/usr/share/mk
chmod 755 $RELEASEDIR/usr/share/mk chmod 755 $RELEASEDIR/usr/share/mk
cp $RELEASEDIR/usr/src/share/mk/* $RELEASEDIR/usr/share/mk/ cp $RELEASEDIR/usr/src/share/mk/* $RELEASEDIR/usr/share/mk/
chown -R root $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 cp chrootmake.sh $RELEASEDIR/usr/$SRC/tools/chrootmake.sh
echo " * Make hierarchy" echo " * Make hierarchy"
@ -255,6 +256,8 @@ if [ "$CUSTOM_PACKAGES" ]
then echo $PKG_ADD_URL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf then echo $PKG_ADD_URL >$RELEASEDIR/usr/pkg/etc/pkgin/repositories.conf
fi fi
echo " * Resetting timestamps"
find $RELEASEDIR | xargs touch
echo " * Chroot build" echo " * Chroot build"
chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1 chroot $RELEASEDIR "PATH=/$XBIN:/usr/pkg/bin MAKEMAP=$MAKEMAP sh -x /usr/$SRC/tools/chrootmake.sh" || exit 1
echo " * Chroot build done" echo " * Chroot build done"
@ -264,9 +267,6 @@ rm -rf $RELEASEDIR/$XBIN
chown -R root $RELEASEDIR/usr/src* chown -R root $RELEASEDIR/usr/src*
cp issue.install $RELEASEDIR/etc/issue cp issue.install $RELEASEDIR/etc/issue
echo " * Resetting timestamps"
find $RELEASEDIR | xargs touch
echo $version_pretty, SVN revision $REVISION, generated `date` >$RELEASEDIR/etc/version echo $version_pretty, SVN revision $REVISION, generated `date` >$RELEASEDIR/etc/version
rm -rf $RELEASEDIR/tmp/* rm -rf $RELEASEDIR/tmp/*
@ -373,7 +373,7 @@ if [ "$USB" -ne 0 ]; then
mv $bootimage $IMG mv $bootimage $IMG
else else
cp $RELEASEDIR/usr/mdec/boot_monitor $CDFILES/boot 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 writeisofs -s0x0 -l MINIX -B $bootimage $boottype $CDFILES $IMG || exit 1
if [ "$HDEMU" -eq 0 ] if [ "$HDEMU" -eq 0 ]