summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-10-13 22:36:31 (UTC)
committer kergoth <kergoth>2002-10-13 22:36:31 (UTC)
commit30faba6b2e07457fcda55e6e968f1230a2e5edda (patch) (side-by-side diff)
treeb7edba6aa28c24265f6ce88c0e0e77162cb802ec
parentc94a9c3a93907d8a0c034e5b4c6d0a768d9fea7c (diff)
downloadopie-30faba6b2e07457fcda55e6e968f1230a2e5edda.zip
opie-30faba6b2e07457fcda55e6e968f1230a2e5edda.tar.gz
opie-30faba6b2e07457fcda55e6e968f1230a2e5edda.tar.bz2
minor tweak to allow passing VERSION_CVS via the environment
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xmkipks2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkipks b/mkipks
index 63d1e22..ca934d8 100755
--- a/mkipks
+++ b/mkipks
@@ -1,55 +1,55 @@
#!/bin/sh
QTE_VERSION=2.3.4
DEB_VERSION=2.0
# Have to do this here, since CVS can't store symlinks
mkdir -p $OPIEDIR/etc/rc2.d
ln -sf ../init.d/opie $OPIEDIR/etc/rc2.d/S98opie
mkdir -p $OPIEDIR/etc/rcS.d
ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
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)"
+ [ -z "$VERSION_CVS" ] && 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
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