Easypack and binpackage try build.minix first, in case a package includes
build itself.
This commit is contained in:
parent
12ac96cf51
commit
9b7acd5257
2 changed files with 14 additions and 4 deletions
|
@ -41,12 +41,16 @@ touch $packagestart
|
||||||
sleep 1
|
sleep 1
|
||||||
cd $dir
|
cd $dir
|
||||||
|
|
||||||
if [ ! -f build ]
|
if [ ! -f build -a ! -f build.minix ]
|
||||||
then echo "Error: No build script in $dir."
|
then echo "Error: No build or build.minix script in $dir."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sh -e build
|
if [ -f build.minix ]
|
||||||
|
then sh -e build.minix
|
||||||
|
else sh -e build
|
||||||
|
fi
|
||||||
|
|
||||||
echo " * Building package"
|
echo " * Building package"
|
||||||
( if [ -f $PI ]; then echo $PI; fi; find / -cnewer $packagestart | egrep -v "^($srcdir|/(dev|tmp)|/usr/(tmp|log|adm|run|src)|/etc/utmp|/var/run)" ) | pax -w -d | bzip2 >$tarbz
|
( if [ -f $PI ]; then echo $PI; fi; find / -cnewer $packagestart | egrep -v "^($srcdir|/(dev|tmp)|/usr/(tmp|log|adm|run|src)|/etc/utmp|/var/run)" ) | pax -w -d | bzip2 >$tarbz
|
||||||
rm -f $packagestart $findlist $tarcmd
|
rm -f $packagestart $findlist $tarcmd
|
||||||
|
|
|
@ -95,7 +95,13 @@ do # Check to see if it exists. Don't overwrite unless -o given
|
||||||
# It is now unpacked. Build it
|
# It is now unpacked. Build it
|
||||||
cd $i
|
cd $i
|
||||||
binsizes big
|
binsizes big
|
||||||
if sh build >>$ORIG_DIR/Log 2>&1
|
if [ -f build.minix ]
|
||||||
|
then sh build.minix >>$ORIG_DIR/Log 2>&1
|
||||||
|
r=$?
|
||||||
|
else sh build >>$ORIG_DIR/Log 2>&1
|
||||||
|
r=$?
|
||||||
|
fi
|
||||||
|
if [ $r -eq 0 ]
|
||||||
then echo Package $i installed
|
then echo Package $i installed
|
||||||
else echo Package $i failed to install, see Log
|
else echo Package $i failed to install, see Log
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue