author | kergoth <kergoth> | 2003-04-22 18:50:52 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-22 18:50:52 (UTC) |
commit | 868ff4fcf16fea8a1f89c5b94e3acee18d224073 (patch) (unidiff) | |
tree | 6d96d46726a3ec74da219e5eb286a426c21ce5b6 | |
parent | 1af9ae95fe7e3f58b1efc6f9bd1e8cf8f6f7481d (diff) | |
download | opie-868ff4fcf16fea8a1f89c5b94e3acee18d224073.zip opie-868ff4fcf16fea8a1f89c5b94e3acee18d224073.tar.gz opie-868ff4fcf16fea8a1f89c5b94e3acee18d224073.tar.bz2 |
Alter mkipks to obey Packages field in a control file if its set, otherwise use filename
-rwxr-xr-x | mkipks | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -210,9 +210,13 @@ do | |||
210 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') | 210 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
211 | if (which mkfs.jffs2 >/dev/null 2>&1); then | 211 | if (which mkfs.jffs2 >/dev/null 2>&1); then |
212 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) | 212 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
213 | fi | 213 | fi |
214 | echo "Package: $packagename" >$CTRLDIR/control | 214 | if ! (cat $f|grep -q ^Package); then |
215 | echo "Package: $packagename" >$CTRLDIR/control | ||
216 | else | ||
217 | cat $f|grep ^Package >$CTRLDIR/control | ||
218 | fi | ||
215 | if [ ! -z "$size" ]; then | 219 | if [ ! -z "$size" ]; then |
216 | echo "Installed-Size: $size" >>$CTRLDIR/control | 220 | echo "Installed-Size: $size" >>$CTRLDIR/control |
217 | else | 221 | else |
218 | if [ -z "$SIZEWARNED" ] | 222 | if [ -z "$SIZEWARNED" ] |