Changed a couple minor paths to allow one to run mkipks from somewhere other than

1 files changed, 7 insertions, 9 deletions

diff --git a/mkipks b/mkipks
index af1bb4d..982a007 100755
--- a/mkipks
+++ b/mkipks
@@ -1,40 +1,37 @@
 #!/bin/sh
 
 QTE_VERSION=2.3.4
 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
+mkdir -p $OPIEDIR/etc/rc2.d
+ln -sf ../init.d/opie $OPIEDIR/etc/rc2.d/S98opie
 
-mkdir -p etc/rcS.d
-rm -f etc/rcS.d/S01bootsplash
-ln -s ../init.d/bootsplash etc/rcS.d/S01bootsplash
+mkdir -p $OPIEDIR/etc/rcS.d
+ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
 
-rm -f ipaq/etc/rc2.d/S96opieatd
-ln -s ../init.d/opieatd ipaq/etc/rc2.d/S96opieatd
+ln -sf ../init.d/opieatd $OPIEDIR/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
 CTRLDIR=$TDIR/CONTROL
@@ -71,48 +68,49 @@ do
         shift
         ARCH=$1
         STRIP=
         STRIP_FILES=
     ;; /*)
         FILES="$FILES $1"
     ;; *)
         FILES="$FILES $PWD/$1"
     esac
     shift
 done
 
 if [ -n "$CLASSIC" ]
 then
     DATADIR=$TDIR/data
     CTRLDIR=$TDIR/control
 fi
 
 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
@@ -211,49 +209,49 @@ do
                     then
             echo "Warning, no mkfs.jffs2 found, unable to set Installed-Size."
             SIZEWARNED=1
                     fi
             fi
             echo "Architecture: $ARCH" >>$CTRLDIR/control 
             echo "Filename: ./$package.ipk" >>$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 "$CLASSIC" ] && 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 [ -z "$CLASSIC" ]
             then
-                $OPIEDIR/scripts/ipkg-build -o root -g root $TDIR
+                cd $ORIGDIR; $OPIEDIR/scripts/ipkg-build -o root -g root $TDIR; cd $OPIEDIR;
             else
                     if [ "`id -u`" != "0" ]
                 then
                     if [ -z "$ROOTWARNED" ]
                     then
                         echo Warning. You are not root. Please become root or use fakeroot.
                         ROOTWARNED=1
                     fi
                 else
                     chown -R root.root $TDIR/*
                 fi
                 ( cd $DATADIR && tar -czf $TDIR/data.tar.gz * )
                 ( cd $CTRLDIR && tar -czf $TDIR/control.tar.gz * )
                 ( cd $TDIR && tar -czf $OPIEDIR/$package.ipk ./control.tar.gz ./data.tar.gz ./debian-binary )
             fi
             RESULT=$package.ipk
             if [ -n "$VERB" ]
             then
                 echo >&2 "Built $RESULT ($size)"
             fi
             if [ -n "$LIST" ]
             then
                 echo $RESULT
             fi