summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks6
1 files changed, 5 insertions, 1 deletions
diff --git a/mkipks b/mkipks
index 6a1d46e..ec5a659 100755
--- a/mkipks
+++ b/mkipks
@@ -202,25 +202,29 @@ 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
- 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."
SIZEWARNED=1
fi
fi
echo "Architecture: $ARCH" >>$CTRLDIR/control
echo "Version: $version" >>$CTRLDIR/control
[ ! -z "$depends" ] && echo "Depends: $depends" >>$CTRLDIR/control