summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/opie-bootsplash.control2
-rwxr-xr-xmkipks5
2 files changed, 4 insertions, 3 deletions
diff --git a/library/opie-bootsplash.control b/library/opie-bootsplash.control
index 98d9339..aad3a84 100644
--- a/library/opie-bootsplash.control
+++ b/library/opie-bootsplash.control
@@ -1,7 +1,7 @@
1Files: etc/init.d/bootsplash etc/rc2.d/S01bootsplash pics/bootsplash/bootlogo 1Files: etc/init.d/bootsplash etc/rcS.d/S01bootsplash pics/bootsplash/bootlogo
2Priority: optinal 2Priority: optinal
3Section: opie/system 3Section: opie/system
4Maintainer: Project Opie <opie@handhelds.org> 4Maintainer: Project Opie <opie@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION.2 6Version: $QPE_VERSION-$SUB_VERSION.2
7Description: Splash screen aptempt 7Description: Splash screen aptempt
diff --git a/mkipks b/mkipks
index 1841bc9..8c865d3 100755
--- a/mkipks
+++ b/mkipks
@@ -1,76 +1,77 @@
1#!/bin/sh 1#!/bin/sh
2 2
3QTE_VERSION=2.3.3 3QTE_VERSION=2.3.3
4DEB_VERSION=2.0 4DEB_VERSION=2.0
5 5
6# Have to do this here, since CVS can't store symlinks 6# Have to do this here, since CVS can't store symlinks
7mkdir -p etc/rc2.d 7mkdir -p etc/rc2.d
8rm -f etc/rc2.d/S98opie 8rm -f etc/rc2.d/S98opie
9ln -s ../init.d/opie etc/rc2.d/S98opie 9ln -s ../init.d/opie etc/rc2.d/S98opie
10 10
11rm -f etc/rc2.d/S01bootsplash 11mkdir -p etc/rcS.d
12ln -s ../init.d/opie etc/rc2.d/S01bootsplash 12rm -f etc/rcS.d/S01bootsplash
13ln -s ../init.d/opie etc/rcS.d/S01bootsplash
13 14
14rm -f ipaq/etc/rc2.d/S96opieatd 15rm -f ipaq/etc/rc2.d/S96opieatd
15ln -s ../init.d/opieatd ipaq/etc/rc2.d/S96opieatd 16ln -s ../init.d/opieatd ipaq/etc/rc2.d/S96opieatd
16 17
17 18
18 19
19VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) 20VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
20VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) 21VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
21VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) 22VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
22SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) 23SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
23if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h 24if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
24then 25then
25 VERSION_CVS="$(date +%Y%m%d)" 26 VERSION_CVS="$(date +%Y%m%d)"
26 SUB_VERSION=$VERSION_CVS 27 SUB_VERSION=$VERSION_CVS
27else 28else
28 VERSION_CVS="" 29 VERSION_CVS=""
29fi 30fi
30 31
31QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT 32QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
32 33
33ARCH=arm 34ARCH=arm
34STRIP=arm-linux-strip 35STRIP=arm-linux-strip
35STRIP_FILES="*ARM*not stripped" 36STRIP_FILES="*ARM*not stripped"
36 37
37TDIR=/tmp/ipk$$ 38TDIR=/tmp/ipk$$
38DATADIR=$TDIR 39DATADIR=$TDIR
39CTRLDIR=$TDIR/CONTROL 40CTRLDIR=$TDIR/CONTROL
40 41
41IMAGEDIR= 42IMAGEDIR=
42VERB= 43VERB=
43LIST= 44LIST=
44RPM= 45RPM=
45 46
46while [ $# -ne 0 ] 47while [ $# -ne 0 ]
47do 48do
48 case "$1" in 49 case "$1" in
49 -v) 50 -v)
50 VERB=1 51 VERB=1
51 echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS" 52 echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS"
52 ;; -l) 53 ;; -l)
53 LIST=1 54 LIST=1
54 ;; -i) 55 ;; -i)
55 shift 56 shift
56 IMAGEDIR=$1 57 IMAGEDIR=$1
57 DATADIR=$IMAGEDIR 58 DATADIR=$IMAGEDIR
58 mkdir -p $IMAGEDIR 59 mkdir -p $IMAGEDIR
59 ;; -rpm) 60 ;; -rpm)
60 if [ "$OPIEDIR" != "/opt/Qtopia" ] 61 if [ "$OPIEDIR" != "/opt/Qtopia" ]
61 then 62 then
62 echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.' 63 echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
63 sleep 1 64 sleep 1
64 #exit 1 65 #exit 1
65 fi 66 fi
66 RPM=1 67 RPM=1
67 ;; -arch) 68 ;; -arch)
68 shift 69 shift
69 ARCH=$1 70 ARCH=$1
70 STRIP= 71 STRIP=
71 STRIP_FILES= 72 STRIP_FILES=
72 ;; /*) 73 ;; /*)
73 FILES="$FILES $1" 74 FILES="$FILES $1"
74 ;; *) 75 ;; *)
75 FILES="$FILES $PWD/$1" 76 FILES="$FILES $PWD/$1"
76 esac 77 esac