We use new ipk format now.

1 files changed, 18 insertions, 17 deletions

diff --git a/mkipks b/mkipks
index 21b903c..26c72b9 100755
--- a/mkipks
+++ b/mkipks
@@ -1,82 +1,82 @@
 #!/bin/sh
 
 QTE_VERSION=2.3.2
 DEB_VERSION=2.0
 
 # Have to do this here, since CVS can't store symlinks
 mkdir -p etc/rc2.d
 rm -f etc/rc2.d/S98opie
 ln -s ../init.d/opie etc/rc2.d/S98opie
 
 rm -f ipaq/etc/rc2.d/S96opieatd
 ln -s ../init.d/opieatd ipaq/etc/rc2.d/S96opieatd
 
 VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
 VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
 SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
 if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
 then
     VERSION_CVS="$(date +%Y%m%d)"
     SUB_VERSION=$VERSION_CVS
 else
     VERSION_CVS=""
 fi
 
 QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
 
 ARCH=arm
 STRIP=arm-linux-strip
 STRIP_FILES="*ARM*not stripped"
 
 TDIR=/tmp/ipk$$
-DATADIR=$TDIR/data
-CTRLDIR=$TDIR/control
+DATADIR=$TDIR
+CTRLDIR=$TDIR/CONTROL
 
 IMAGEDIR=
 VERB=
 LIST=
 RPM=
 
 while [ $# -ne 0 ]
 do
     case "$1" in
      -v)
         VERB=1
         echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS"
     ;; -l)
         LIST=1
     ;; -i)
         shift
         IMAGEDIR=$1
         DATADIR=$IMAGEDIR
         mkdir -p $IMAGEDIR
     ;; -rpm)
         if [ "$OPIEDIR" != "/opt/Qtopia" ]
         then
             echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
             sleep 1
             #exit 1
         fi
         RPM=1
     ;; -arch)
         shift
         ARCH=$1
         STRIP=
         STRIP_FILES=
     ;; /*)
         FILES="$FILES $1"
     ;; *)
         FILES="$FILES $PWD/$1"
     esac
     shift
 done
 
 
 if [ -z "$FILES" ]
 then
     FILES=`find $OPIEDIR -name "*.control" -print`
 fi
 
 RDIR=$PWD
 cd $OPIEDIR
@@ -142,90 +142,91 @@ do
                             $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/[ ].*//')
-            size=$(mkfs.jffs2 -r $DATADIR | wc -c)
+            if (which mkfs.jffs2 >/dev/null 2>&1); then
+                size=$(mkfs.jffs2 -r $DATADIR | wc -c)
+            fi
             echo "Package: $packagename" >$CTRLDIR/control
+            if [ ! -z "$size" ]; then
             echo "Installed-Size: $size" >>$CTRLDIR/control
+            else
+            echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size."
+            fi
+            echo "Architecture: $ARCH" >>$CTRLDIR/control 
             echo "Filename: ./$package.ipk" >>$CTRLDIR/control
             echo "Version: $version" >>$CTRLDIR/control
-            echo "Depends: $depends" >>$CTRLDIR/control
-            echo "Provides: $provides" >>$CTRLDIR/control
-            echo "Conflicts: $conflicts" >>$CTRLDIR/control
-            egrep -v "^(Files|Version|Depends|Provides|Conflicts):" >>$CTRLDIR/control $i
-            echo "$DEB_VERSION" >$TDIR/debian-binary
+            [ ! -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
+        #    echo "$DEB_VERSION" >$TDIR/debian-binary
             base=${i%.control}
             scripts="preinst postinst prerm postrm"
             for pf in $scripts
             do
                 if [ -x ${base}.$pf ]
                 then
                     cp ${base}.$pf $CTRLDIR/$pf
                 fi
             done
-            if [ "$UID" = 0 ]
-            then
-                chown -R root.root $TDIR
-            else
-                    echo "Warning: You are not root. Unable to squash permissions."
-            fi
-            ( cd $CTRLDIR; tar cfz ../control.tar.gz ./*; )
-            ( cd $DATADIR; tar cfz ../data.tar.gz ./*; )
-            ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk
+            $OPIEDIR/scripts/ipkg-build -o root -g root $TDIR
             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