summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-24 17:10:10 (UTC)
committer kergoth <kergoth>2003-04-24 17:10:10 (UTC)
commit786111b4ee9a950519d2ec36fabf0eb53c03770d (patch) (side-by-side diff)
treede055f5c4a5121490d0e2bb81c51ddaaf114b672
parent9bedd27d07bcd1d9f2737f023e917f27499ba4b8 (diff)
downloadopie-786111b4ee9a950519d2ec36fabf0eb53c03770d.zip
opie-786111b4ee9a950519d2ec36fabf0eb53c03770d.tar.gz
opie-786111b4ee9a950519d2ec36fabf0eb53c03770d.tar.bz2
Make mkipks check for existing Package field more explicit
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkipks b/mkipks
index 73bff3c..f142029 100755
--- a/mkipks
+++ b/mkipks
@@ -204,25 +204,25 @@ do
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 $i|grep -q ^Package); then
+ if ! (cat $i|grep -q ^Package:); then
echo "Package: $packagename" >$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