|
diff --git a/mkipks b/mkipks index d44f074..2a247ff 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -11,13 +11,14 @@ ln -s ../init.d/qpe etc/rc2.d/S98qpe |
11 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
11 | 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) |
12 | 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) |
13 | 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) |
14 | 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 |
15 | if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h |
16 | then |
16 | then |
17 | VERSION_CVS="_$(date +%Y%m%d)" |
17 | VERSION_CVS="$(date +%Y%m%d)" |
| |
18 | SUB_VERSION=$VERSION_CVS |
18 | else |
19 | else |
19 | VERSION_CVS="" |
20 | VERSION_CVS="" |
20 | fi |
21 | fi |
21 | |
22 | |
22 | QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT |
23 | QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT |
23 | |
24 | |
@@ -198,15 +199,17 @@ do |
198 | cp ${base}.$pf $CTRLDIR/$pf |
199 | cp ${base}.$pf $CTRLDIR/$pf |
199 | fi |
200 | fi |
200 | done |
201 | done |
201 | if [ "$UID" = 0 ] |
202 | if [ "$UID" = 0 ] |
202 | then |
203 | then |
203 | chown -R root.root $TDIR |
204 | chown -R root.root $TDIR |
| |
205 | else |
| |
206 | echo "Warning: You are not root. Unable to squash permissions." |
204 | fi |
207 | fi |
205 | ( cd $CTRLDIR; tar cfz ../control.tar.gz ./*; ) |
208 | ( cd $CTRLDIR; tar --owner root --group root cfz ../control.tar.gz ./*; ) |
206 | ( cd $DATADIR; tar cfz ../data.tar.gz ./*; ) |
209 | ( cd $DATADIR; tar --owner root --group root cfz ../data.tar.gz ./*; ) |
207 | ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk |
210 | ( cd $TDIR; rm -rf control data; tar cf - ./debian-binary ./control.tar.gz ./data.tar.gz; ) | gzip >$RDIR/$package.ipk |
208 | RESULT=$package.ipk |
211 | RESULT=$package.ipk |
209 | if [ -n "$VERB" ] |
212 | if [ -n "$VERB" ] |
210 | then |
213 | then |
211 | echo >&2 "Built $RESULT ($size)" |
214 | echo >&2 "Built $RESULT ($size)" |
212 | fi |
215 | fi |
|