author | kergoth <kergoth> | 2003-04-22 18:55:40 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-22 18:55:40 (UTC) |
commit | 01fce94491cd4ceaffaaf7564f762b86ddf47241 (patch) (side-by-side diff) | |
tree | a91acf2ead94bc5fb0154863be126d9f1ed88f91 | |
parent | 868ff4fcf16fea8a1f89c5b94e3acee18d224073 (diff) | |
download | opie-01fce94491cd4ceaffaaf7564f762b86ddf47241.zip opie-01fce94491cd4ceaffaaf7564f762b86ddf47241.tar.gz opie-01fce94491cd4ceaffaaf7564f762b86ddf47241.tar.bz2 |
Thinko.
-rwxr-xr-x | mkipks | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -198,36 +198,34 @@ do echo >>$SPEC "Version: ${version%-*}" echo >>$SPEC "Release: ${version#*-}" echo >>$SPEC "%description" sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC echo >>$SPEC "%files" echo >>$SPEC "%defattr(-,root,root)" /bin/ls $RPMFILES >>$SPEC rpm -bb --target $ARCH-unknown-linux $SPEC # rm $SPEC 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 - if ! (cat $f|grep -q ^Package); then + if ! (cat $i|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." SIZEWARNED=1 fi fi echo "Architecture: $ARCH" >>$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 |