| author | kergoth <kergoth> | 2003-04-22 18:50:52 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-04-22 18:50:52 (UTC) |
| commit | 868ff4fcf16fea8a1f89c5b94e3acee18d224073 (patch) (side-by-side diff) | |
| tree | 6d96d46726a3ec74da219e5eb286a426c21ce5b6 /mkipks | |
| 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
@@ -208,13 +208,17 @@ do elif [ -z "$IMAGEDIR" ] then #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') if (which mkfs.jffs2 >/dev/null 2>&1); then size=$(mkfs.jffs2 -r $DATADIR | wc -c) fi - echo "Package: $packagename" >$CTRLDIR/control + if ! (cat $f|grep -q ^Package); then + echo "Package: $packagename" >$CTRLDIR/control + else + cat $f|grep ^Package >$CTRLDIR/control + fi if [ ! -z "$size" ]; then echo "Installed-Size: $size" >>$CTRLDIR/control else if [ -z "$SIZEWARNED" ] then echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size." |