Alter mkipks to obey Packages field in a control file if its set, otherwise use filename

1 files changed, 4 insertions, 0 deletions

diff --git a/mkipks b/mkipks
index 6a1d46e..ec5a659 100755
--- a/mkipks
+++ b/mkipks
@@ -86,172 +86,176 @@ do
     ;; *)
 	FILES="$FILES $PWD/$1"
     esac
     shift
 done
 
 if [ -z "$FILES" ]
 then
     FILES=`find $OPIEDIR -name "*.control" -print`
 fi
 
 RDIR=$PWD
 ORIGDIR=`pwd`
 cd $OPIEDIR
 
 for i in $FILES
 do
     rm -rf $TDIR
 
     mkdir -p $DATADIR
     mkdir -p $CTRLDIR
 
     packagename=${i##*/}; packagename=${packagename%.control}
     version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"')
     depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"')
     files=$(eval echo $(sed -n -e "s/^Files://p" $i))
     arch=$(eval echo $(sed -n -e "s/^Arch://p" $i))
     section=$(sed -n -e "s/^Section: *//p" $i)
     provides=$(sed -n -e "s/^Provides: *//p" $i)
     conflicts=$(sed -n -e "s/^Conflicts: *//p" $i)
     license=$(sed -n -e "s/^License: *//p" $i)
     summary=$(sed -n -e "s/^Description: *//p" $i)
     package=${packagename}_${version}_$ARCH
     ERROR=
     if [ -z "$files" ]
     then
 	mkdir -p $DATADIR/usr/share/doc/$packagename
     else
 	for f in $files
 	do
 	    if [ -d $f ]
 	    then
 		ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
 	    else
 		ffiles=$f
 	    fi
 	    for ff in $ffiles
 	    do
 		case $ff in
 		    */CVS/*)
 		    continue
 		;;	*~)
 		    continue
 		;;	*.control)
 		    continue
 		;; $QTDIR/*)
 		    BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/})
 		;; etc/*.d/*)
 		    BASE=$(dirname /$ff)
 		;; root/*)
 		    BASE=$(dirname ${ff#root})
 		;; lib/*)
 		    BASE=$(dirname /opt/QtPalmtop/$ff)
 		;; $OPIEDIR/lib/*)
 		    BASE=$(dirname /opt/QtPalmtop/${ff#$OPIEDIR/})
 		;; *)
 		    # For SHARP ROM compatibility. Should change to Qtopia.
 		    BASE=/opt/QtPalmtop/$(dirname $ff)
 		esac
 
 		if [ -f $ff -o -b $ff -o -c $ff ]
 		then
 		    D=$DATADIR$BASE
 		    if [ -x $ff -a -n "$STRIP" ]
 		    then
 			case $(file $ff) in
 			 $STRIP_FILES)
 			    $STRIP $ff
 			 ;; *)
 			esac
 		    fi
 		    if [ -n "$RPM" ]
 		    then
 			case "$ff" in
 			 /*) RPMFILES="$RPMFILES $ff"
 			;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
 			esac
 		    else
 			mkdir -p $D
 			if cp -a $ff $D
 			then
 			    true
 			else
 			    ERROR=1
 			fi
 		    fi
 		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
+	    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
 	    if [ -n "$LIST" ]
 	    then
 		echo $RESULT
 	    fi
 	fi
     else
 	echo >&2 "Not building $package package"
     fi
 done
 # clean up 
 rm -rf $TDIR