diff --git a/genpkg b/genpkg index ac69542..2033f50 100755 --- a/genpkg +++ b/genpkg @@ -345,6 +345,10 @@ pkggen() { mkdir -p $DEVTMPROOT/$DIR mv $i $DEVTMPROOT/$DIR done + if [ -f $TMPROOT/tmp/preinstall ]; then + bzip2 -d -c $TMPROOT/tmp/preinstall $TMPROOT/../$$/preinstall + rm $TMPROOT/tmp/preinstall + fi sync InitDispatch if [ ! `find . -type f|wc -l` == "0" ]; then @@ -443,6 +447,11 @@ pkggen() { LINE=$LINE"0 " fi done + if [ -f preinstall ]; then + LINE=$LINE"`wc -c meta|awk '{print $1}'` " + else + LINE=$LINE"0 " + fi echo $LINE >$DISTTARGET/$SRCPATH/$PKGNAME if [ -f dep ]; then cat dep >>$DISTTARGET/$SRCPATH/$PKGNAME @@ -455,6 +464,9 @@ pkggen() { cat $i >>$DISTTARGET/$SRCPATH/$PKGNAME fi done + if [ -f preinstall ]; then + cat preinstall >>$DISTTARGET/$SRCPATH/$PKGNAME + fi cd .. rm -rf $TMPROOT/../$$ fi @@ -475,7 +487,7 @@ pkggen() { else INSTALLOPTS=$INSTALLOPTS" -fi" fi - installpkg -o $INSTALLOPTS $DISTTARGET/$SRCPATH/$PKGNAME + installpkg -no $INSTALLOPTS $DISTTARGET/$SRCPATH/$PKGNAME CheckError "Installation of $PKGNAME failed" else echo "installing $DISTTARGET/$SRCPATH/$PKGNAME" @@ -765,7 +777,7 @@ if [ ! "$C_FLAG" == "0" ]; then if [ "$CHECKFLAGS" == "0" ]; then INSTALLOPTS="-o" fi - installpkg $INSTALLOPTS -i $DISTTARGET/$SRCPATH/$PKGNAME + installpkg $INSTALLOPTS -noi $DISTTARGET/$SRCPATH/$PKGNAME fi DEINSTALL=0 INSTALL=0