|
diff --git a/Makefile b/Makefile index f6f13a6..3db1766 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -32,33 +32,33 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \ |
32 | settings/light-and-power \ |
32 | settings/light-and-power \ |
33 | settings/language \ |
33 | settings/language \ |
34 | settings/rotation \ |
34 | settings/rotation \ |
35 | settings/appearance \ |
35 | settings/appearance \ |
36 | settings/security \ |
36 | settings/security \ |
37 | settings/sound \ |
37 | settings/sound \ |
38 | settings/systemtime \ |
38 | settings/systemtime \ |
39 | settings/mediummount \ |
39 | settings/mediummount \ |
40 | settings/tabmanager \ |
40 | settings/tabmanager \ |
41 | solitaire spreadsheet tetrix textedit \ |
41 | solitaire spreadsheet tetrix textedit \ |
42 | todo wordgame embeddedkonsole launcher sysinfo \ |
42 | todo wordgame embeddedkonsole launcher sysinfo \ |
43 | parashoot snake citytime showimg netsetup core/wlansetup tableviewer \ |
43 | parashoot snake citytime showimg netsetup core/wlansetup tableviewer \ |
44 | core/oipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ |
44 | core/oipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \ |
45 | noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \ |
45 | noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \ |
46 | noncore/kpacman noncore/advancedfm noncore/kbill noncore/remote noncore/opie-sh |
46 | noncore/kpacman noncore/advancedfm noncore/kbill noncore/remote noncore/opie-sh |
47 | |
47 | |
48 | NONTMAKEAPPS := noncore/nethack |
48 | NONTMAKEAPPS := ipaq/opiealarm noncore/nethack |
49 | |
49 | |
50 | DOCS = docs/src/opie-policy |
50 | DOCS = docs/src/opie-policy |
51 | single: mpegplayer/libmpeg3 |
51 | single: mpegplayer/libmpeg3 |
52 | |
52 | |
53 | dynamic: $(APPS) $(NONTMAKEAPPS) |
53 | dynamic: $(APPS) $(NONTMAKEAPPS) |
54 | |
54 | |
55 | docs: $(DOCS) |
55 | docs: $(DOCS) |
56 | |
56 | |
57 | $(COMPONENTS): $(LIBS) |
57 | $(COMPONENTS): $(LIBS) |
58 | |
58 | |
59 | $(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS) |
59 | $(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS) |
60 | |
60 | |
61 | $(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single: |
61 | $(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single: |
62 | $(MAKE) -C $@ -f Makefile |
62 | $(MAKE) -C $@ -f Makefile |
63 | |
63 | |
64 | showcomponents: |
64 | showcomponents: |
|
|
diff --git a/mkipks b/mkipks index 2259221..b3f87c8 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -1,26 +1,29 @@ |
1 | #!/bin/sh |
1 | #!/bin/sh |
2 | |
2 | |
3 | QTE_VERSION=2.3.2 |
3 | QTE_VERSION=2.3.2 |
4 | DEB_VERSION=2.0 |
4 | DEB_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 |
7 | mkdir -p etc/rc2.d |
7 | mkdir -p etc/rc2.d |
8 | rm -f etc/rc2.d/S98qpe |
8 | rm -f etc/rc2.d/S98qpe |
9 | ln -s ../init.d/qpe etc/rc2.d/S98qpe |
9 | ln -s ../init.d/qpe etc/rc2.d/S98qpe |
10 | |
10 | |
| |
11 | rm -f ipaq/etc/rc2.d/S96opieatd |
| |
12 | ln -s ../init.d/opieatd ipaq/etc/rc2.d/S96opieatd |
| |
13 | |
11 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
14 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
12 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
15 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
13 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) |
16 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) |
14 | SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) |
17 | SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) |
15 | if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h |
18 | if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h |
16 | then |
19 | then |
17 | VERSION_CVS="$(date +%Y%m%d)" |
20 | VERSION_CVS="$(date +%Y%m%d)" |
18 | SUB_VERSION=$VERSION_CVS |
21 | SUB_VERSION=$VERSION_CVS |
19 | else |
22 | else |
20 | VERSION_CVS="" |
23 | VERSION_CVS="" |
21 | fi |
24 | fi |
22 | |
25 | |
23 | QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT |
26 | QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT |
24 | |
27 | |
25 | ARCH=arm |
28 | ARCH=arm |
26 | STRIP=arm-linux-strip |
29 | STRIP=arm-linux-strip |
@@ -179,33 +182,33 @@ do |
179 | echo >>$SPEC "%files" |
182 | echo >>$SPEC "%files" |
180 | echo >>$SPEC "%defattr(-,root,root)" |
183 | echo >>$SPEC "%defattr(-,root,root)" |
181 | /bin/ls $RPMFILES >>$SPEC |
184 | /bin/ls $RPMFILES >>$SPEC |
182 | rpm -bb --target $ARCH-unknown-linux $SPEC |
185 | rpm -bb --target $ARCH-unknown-linux $SPEC |
183 | # rm $SPEC |
186 | # rm $SPEC |
184 | elif [ -z "$IMAGEDIR" ] |
187 | elif [ -z "$IMAGEDIR" ] |
185 | then |
188 | then |
186 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
189 | #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//') |
187 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
190 | size=$(mkfs.jffs2 -r $DATADIR | wc -c) |
188 | echo "Package: $packagename" >$CTRLDIR/control |
191 | echo "Package: $packagename" >$CTRLDIR/control |
189 | echo "Installed-Size: $size" >>$CTRLDIR/control |
192 | echo "Installed-Size: $size" >>$CTRLDIR/control |
190 | echo "Filename: ./$package.ipk" >>$CTRLDIR/control |
193 | echo "Filename: ./$package.ipk" >>$CTRLDIR/control |
191 | echo "Version: $version" >>$CTRLDIR/control |
194 | echo "Version: $version" >>$CTRLDIR/control |
192 | echo "Depends: $depends" >>$CTRLDIR/control |
195 | echo "Depends: $depends" >>$CTRLDIR/control |
193 | echo "Provides: $provides" >>$CTRLDIR/control |
196 | echo "Provides: $provides" >>$CTRLDIR/control |
194 | echo "Conflicts: $conflicts" >>$CTRLDIR/control |
197 | echo "Conflicts: $conflicts" >>$CTRLDIR/control |
195 | egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i |
198 | egrep -v "^(Files|Version|Depends|Provides|Conflicts):" >>$CTRLDIR/control $i |
196 | echo "$DEB_VERSION" >$TDIR/debian-binary |
199 | echo "$DEB_VERSION" >$TDIR/debian-binary |
197 | base=${i%.control} |
200 | base=${i%.control} |
198 | scripts="preinst postinst prerm postrm" |
201 | scripts="preinst postinst prerm postrm" |
199 | for pf in $scripts |
202 | for pf in $scripts |
200 | do |
203 | do |
201 | if [ -x ${base}.$pf ] |
204 | if [ -x ${base}.$pf ] |
202 | then |
205 | then |
203 | cp ${base}.$pf $CTRLDIR/$pf |
206 | cp ${base}.$pf $CTRLDIR/$pf |
204 | fi |
207 | fi |
205 | done |
208 | done |
206 | if [ "$UID" = 0 ] |
209 | if [ "$UID" = 0 ] |
207 | then |
210 | then |
208 | chown -R root.root $TDIR |
211 | chown -R root.root $TDIR |
209 | else |
212 | else |
210 | echo "Warning: You are not root. Unable to squash permissions." |
213 | echo "Warning: You are not root. Unable to squash permissions." |
211 | fi |
214 | fi |
|