summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-04-22 18:50:52 (UTC)
committer kergoth <kergoth>2003-04-22 18:50:52 (UTC)
commit868ff4fcf16fea8a1f89c5b94e3acee18d224073 (patch) (side-by-side diff)
tree6d96d46726a3ec74da219e5eb286a426c21ce5b6
parent1af9ae95fe7e3f58b1efc6f9bd1e8cf8f6f7481d (diff)
downloadopie-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
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
@@ -198,33 +198,37 @@ 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
- 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
[ ! -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
[ -n "$classicopts" ] && echo "$DEB_VERSION" >$TDIR/debian-binary