summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rwxr-xr-xmkipks5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f6f13a6..3db1766 100644
--- a/Makefile
+++ b/Makefile
@@ -42,13 +42,13 @@ APPS=$(LOCALAPPS) core/addressbook calculator clock datebook \
todo wordgame embeddedkonsole launcher sysinfo \
parashoot snake citytime showimg netsetup core/wlansetup tableviewer \
core/oipkg mindbreaker go qasteroids qcop fifteen keypebble today opiemail/converter opiemail \
noncore/tictac noncore/opieftp noncore/drawpad noncore/kcheckers noncore/appskey noncore/qpdf \
noncore/kpacman noncore/advancedfm noncore/kbill noncore/remote noncore/opie-sh
-NONTMAKEAPPS := noncore/nethack
+NONTMAKEAPPS := ipaq/opiealarm noncore/nethack
DOCS = docs/src/opie-policy
single: mpegplayer/libmpeg3
dynamic: $(APPS) $(NONTMAKEAPPS)
diff --git a/mkipks b/mkipks
index 2259221..b3f87c8 100755
--- a/mkipks
+++ b/mkipks
@@ -5,12 +5,15 @@ 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/S98qpe
ln -s ../init.d/qpe etc/rc2.d/S98qpe
+rm -f ipaq/etc/rc2.d/S96opieatd
+ln -s ../init.d/opieatd 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
@@ -189,13 +192,13 @@ do
echo "Installed-Size: $size" >>$CTRLDIR/control
echo "Filename: ./$package.ipk" >>$CTRLDIR/control
echo "Version: $version" >>$CTRLDIR/control
echo "Depends: $depends" >>$CTRLDIR/control
echo "Provides: $provides" >>$CTRLDIR/control
echo "Conflicts: $conflicts" >>$CTRLDIR/control
- egrep -v "^(Files|Version|Depends):" >>$CTRLDIR/control $i
+ egrep -v "^(Files|Version|Depends|Provides|Conflicts):" >>$CTRLDIR/control $i
echo "$DEB_VERSION" >$TDIR/debian-binary
base=${i%.control}
scripts="preinst postinst prerm postrm"
for pf in $scripts
do
if [ -x ${base}.$pf ]