author | kergoth <kergoth> | 2002-09-24 20:58:00 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-09-24 20:58:00 (UTC) |
commit | 93be75ceab687091f76a459eb34bfd4859986116 (patch) (unidiff) | |
tree | fdb4028af020b4a5a388270c88d68c45544b8a57 | |
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
@@ -56,5 +56,5 @@ do | |||
56 | mkdir -p $IMAGEDIR | 56 | mkdir -p $IMAGEDIR |
57 | ;; -classic) | 57 | ;; -classic) |
58 | CLASSIC=1 | 58 | classicopts=-c |
59 | ;; -rpm) | 59 | ;; -rpm) |
60 | if [ "$OPIEDIR" != "/opt/Qtopia" ] | 60 | if [ "$OPIEDIR" != "/opt/Qtopia" ] |
@@ -78,10 +78,4 @@ do | |||
78 | done | 78 | done |
79 | 79 | ||
80 | if [ -n "$CLASSIC" ] | ||
81 | then | ||
82 | DATADIR=$TDIR/data | ||
83 | CTRLDIR=$TDIR/control | ||
84 | fi | ||
85 | |||
86 | if [ -z "$FILES" ] | 80 | if [ -z "$FILES" ] |
87 | then | 81 | then |
@@ -219,5 +213,5 @@ do | |||
219 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control | 213 | [ ! -z "$conflicts" ] && echo "Conflicts: $conflicts" >>$CTRLDIR/control |
220 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i | 214 | egrep -v "^(Files|Version|Depends|Provides|Conflicts|Architecture):" >>$CTRLDIR/control $i |
221 | [ -n "$CLASSIC" ] && echo "$DEB_VERSION" >$TDIR/debian-binary | 215 | [ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary |
222 | base=${i%.control} | 216 | base=${i%.control} |
223 | scripts="preinst postinst prerm postrm" | 217 | scripts="preinst postinst prerm postrm" |
@@ -229,22 +223,5 @@ do | |||
229 | fi | 223 | fi |
230 | done | 224 | done |
231 | if [ -z "$CLASSIC" ] | 225 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; |
232 | then | ||
233 | cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build -o root -g root $TDIR; cd $OPIEDIR; | ||
234 | else | ||
235 | if [ "`id -u`" != "0" ] | ||
236 | then | ||
237 | if [ -z "$ROOTWARNED" ] | ||
238 | then | ||
239 | echo Warning. You are not root. Please become root or use fakeroot. | ||
240 | ROOTWARNED=1 | ||
241 | fi | ||
242 | else | ||
243 | chown -R root.root $TDIR/* | ||
244 | fi | ||
245 | ( cd $DATADIR && tar -czf $TDIR/data.tar.gz * ) | ||
246 | ( cd $CTRLDIR && tar -czf $TDIR/control.tar.gz * ) | ||
247 | ( cd $TDIR && tar -czf $OPIEDIR/$package.ipk ./control.tar.gz ./data.tar.gz ./debian-binary ) | ||
248 | fi | ||
249 | RESULT=$package.ipk | 226 | RESULT=$package.ipk |
250 | if [ -n "$VERB" ] | 227 | if [ -n "$VERB" ] |