| -rwxr-xr-x | mkipks | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -182,65 +182,69 @@ do else echo >&2 "$0: $i: No such file: $ff" ERROR=1 fi done done fi if [ -z "$ERROR" ] then if [ -n "$RPM" ] then SPEC=/tmp/mkipks-rpm-$$.spec echo >$SPEC "Summary: $summary" echo >>$SPEC "Name: $packagename" echo >>$SPEC "Group: $section" ########## echo >>$SPEC "License: $license" 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 base=${i%.control} scripts="preinst postinst prerm postrm" for pf in $scripts do if [ -e ${base}.$pf ] then cp ${base}.$pf $CTRLDIR/$pf chmod 755 $CTRLDIR/$pf fi done cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build $classicopts -o root -g root $TDIR; cd $OPIEDIR; RESULT=$package.ipk if [ -n "$VERB" ] then echo >&2 "Built $RESULT ($size)" fi |