Altered version_cvs datestamp handling, and added permissions squashing when it runs tar.

1 files changed, 6 insertions, 3 deletions

diff --git a/mkipks b/mkipks
index d44f074..2a247ff 100755
--- a/mkipks
+++ b/mkipks
@@ -1,41 +1,42 @@
 #!/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/S98qpe
 ln -s ../init.d/qpe etc/rc2.d/S98qpe
 
 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)"
+    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="*Advanced RISC Machines ARM*not stripped"
 
 TDIR=/tmp/ipk$$
 DATADIR=$TDIR/data
 CTRLDIR=$TDIR/control
 
 IMAGEDIR=
 VERB=
 LIST=
 RPM=
 
 while [ $# -ne 0 ]
 do
     case "$1" in
      -v)
         VERB=1
@@ -180,42 +181,44 @@ do
             # rm $SPEC
         elif [ -z "$IMAGEDIR" ]
         then
                     #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//')
             size=$(mkfs.jffs2 -r $DATADIR | wc -c)
             echo "Package: $packagename" >$CTRLDIR/control
             echo "Installed-Size: $size" >>$CTRLDIR/control
             echo "Filename: ./$package.ipk" >>$CTRLDIR/control
             echo "Version: $version" >>$CTRLDIR/control
             echo "Depends: $depends" >>$CTRLDIR/control
             egrep -v "^(Files|Version|Depends):" >>$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 $CTRLDIR; tar --owner root --group root cfz ../control.tar.gz ./*; )
+            ( cd $DATADIR; tar --owner root --group root cfz ../data.tar.gz ./*; )
             ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk
             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