. loops checked for PID_FREE
  . exit broken down in exit and cleanup functions; when reboot happens,
    cleanup is done but not exit (as processes have not actually exited),
    this keeps drivers working
  . fixed a few uninitialized and unused variables

scripts:
  . new packaging system
This commit is contained in:
Ben Gras
2006-03-15 15:34:12 +00:00
parent 7879c008ae
commit ff67776995
13 changed files with 99 additions and 82 deletions

View File

@@ -1,4 +1,5 @@
#!/bin/sh
set -e
export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
cd /usr/src || exit 1
make etcfiles

View File

@@ -72,6 +72,7 @@ usr=/dev/c0d7p0s2
COPYITEMS="usr/bin bin usr/lib"
RELEASEDIR=/usr/r
RELEASEPACKAGE=${RELEASEDIR}/usr/install/packages
IMAGE=cdfdimage
ROOTIMAGE=rootimage
CDFILES=/usr/tmp/cdreleasefiles
@@ -121,7 +122,7 @@ fi
IMGBZ=${IMG}.bz2
echo "Making $IMGBZ"
USRMB=80
USRMB=128
USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
USRSECTS="`expr $USRMB \* 1024 \* 2`"
@@ -230,10 +231,24 @@ echo " * Mounting $TMPDISK as $RELEASEDIR/usr"
mount $TMPDISK $RELEASEDIR/usr || exit
mkdir -p $RELEASEDIR/tmp
mkdir -p $RELEASEDIR/usr/tmp
mkdir -p $RELEASEPACKAGE
echo " * Transfering $COPYITEMS to $RELEASEDIR"
( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1
if [ -d $PACKAGEDIR ]
then echo " * Transfering $PACKAGEDIR to $RELEASEPACKAGE"
cp $PACKAGEDIR/* $RELEASEPACKAGE/
( cd $PACKAGEDIR
for p in *.tar.bz
do descr="../`echo $p | sed 's/.tar.bz//'`/.descr"
if [ -f "$descr" ]
then printf "%-27s %s\n" "$p" "`cat $descr`"
fi
done >List
)
fi
# Make sure compilers and libraries are bin-owned
chown -R bin $RELEASEDIR/usr/lib
chmod -R u+w $RELEASEDIR/usr/lib
@@ -311,19 +326,6 @@ sh mkboot cdfdboot $TMPDISK3
cp $IMAGE $CDFILES/bootflop.img
cp release/cd/* $CDFILES
DESTPACKAGES=$CDFILES/PACKAGES
mkdir -p $DESTPACKAGES
( cd $PACKAGEDIR
for f in *tar*
do
shortname="`echo $f | sed 's/\.tar\..*//' | tr -dc '[a-z][A-z][0-9]' | sed 's/^\(........\).*/\1/' | tr '[a-z]' '[A-Z]'`.TBZ"
cp $f $DESTPACKAGES/$shortname
echo $shortname $f >>$DESTPACKAGES/List
echo " * Copied $f to $shortname"
done
)
h_opt=
bootimage=$IMAGE
if [ "$HDEMU" -ne 0 ]; then