author | kergoth <kergoth> | 2002-09-24 20:58:00 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-09-24 20:58:00 (UTC) |
commit | 93be75ceab687091f76a459eb34bfd4859986116 (patch) (side-by-side diff) | |
tree | fdb4028af020b4a5a388270c88d68c45544b8a57 /mkipks | |
parent | 16b7ec203f0306b911cbb1ee90f75cef9dcc3938 (diff) | |
download | opie-93be75ceab687091f76a459eb34bfd4859986116.zip opie-93be75ceab687091f76a459eb34bfd4859986116.tar.gz opie-93be75ceab687091f76a459eb34bfd4859986116.tar.bz2 |
Make mkipks use ipkg-build [-c].
-rwxr-xr-x | mkipks | 29 |
1 files changed, 3 insertions, 26 deletions
@@ -52,13 +52,13 @@ do ;; -i) shift IMAGEDIR=$1 DATADIR=$IMAGEDIR mkdir -p $IMAGEDIR ;; -classic) - CLASSIC=1 + classicopts=-c ;; -rpm) if [ "$OPIEDIR" != "/opt/Qtopia" ] then echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.' sleep 1 #exit 1 @@ -74,18 +74,12 @@ do ;; *) FILES="$FILES $PWD/$1" esac shift done -if [ -n "$CLASSIC" ] -then - DATADIR=$TDIR/data - CTRLDIR=$TDIR/control -fi - if [ -z "$FILES" ] then FILES=`find $OPIEDIR -name "*.control" -print` fi RDIR=$PWD @@ -215,40 +209,23 @@ do echo "Filename: ./$package.ipk" >>$CTRLDIR/control echo "Version: $version" >>$CTRLDIR/control [ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control [ ! -z "$provides" ] && echo "Provides: $provides" >>$CTRLDIR/control [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i - [ -n "$CLASSIC" ] && echo "$DEB_VERSION" >$TDIR/debian-binary + [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary base=${i%.control} scripts="preinst postinst prerm postrm" for pf in $scripts do if [ -x ${base}.$pf ] then cp ${base}.$pf $CTRLDIR/$pf fi done - if [ -z "$CLASSIC" ] - then - cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build -o root -g root $TDIR; cd $OPIEDIR; - else - if [ "`id -u`" != "0" ] - then - if [ -z "$ROOTWARNED" ] - then - echo Warning. You are not root. Please become root or use fakeroot. - ROOTWARNED=1 - fi - else - chown -R root.root $TDIR/* - fi - ( cd $DATADIR && tar -czf $TDIR/data.tar.gz * ) - ( cd $CTRLDIR && tar -czf $TDIR/control.tar.gz * ) - ( cd $TDIR && tar -czf $OPIEDIR/$package.ipk ./control.tar.gz ./data.tar.gz ./debian-binary ) - fi + cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; RESULT=$package.ipk if [ -n "$VERB" ] then echo >&2 "Built $RESULT ($size)" fi if [ -n "$LIST" ] |