Initial commit of opiealarm/opieatd

Added to main Makefile
Added link generation to mkipks
Patch for mkipks to support Conflicts/Provides

2 files changed, 5 insertions, 2 deletions

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 \
     settings/light-and-power \
     settings/language \
     settings/rotation \
     settings/appearance \
     settings/security \
     settings/sound \
     settings/systemtime \
     settings/mediummount \
     settings/tabmanager \
     solitaire spreadsheet tetrix textedit \
     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)
 
 docs: $(DOCS)
 
 $(COMPONENTS): $(LIBS)
 
 $(NONTMAKEAPPS) $(APPS): $(LIBS) $(COMPONENTS)
 
 $(LIBS) $(COMPONENTS) $(NONTMAKEAPPS) $(APPS) $(DOCS) single:
         $(MAKE) -C $@ -f Makefile
 
 showcomponents:
diff --git a/mkipks b/mkipks
index 2259221..b3f87c8 100755
--- a/mkipks
+++ b/mkipks
@@ -1,26 +1,29 @@
 #!/bin/sh
 
 QTE_VERSION=2.3.2
 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
     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
@@ -179,33 +182,33 @@ do
             echo >>$SPEC "%files"
             echo >>$SPEC "%defattr(-,root,root)"
             /bin/ls $RPMFILES >>$SPEC
             rpm -bb --target $ARCH-unknown-linux $SPEC
             # rm $SPEC
         elif [ -z "$IMAGEDIR" ]
         then
                     #size=$(du -h -s $DATADIR | sed -e 's/[ ].*//')
             size=$(mkfs.jffs2 -r $DATADIR | wc -c)
             echo "Package: $packagename" >$CTRLDIR/control
             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 ]
                 then
                     cp ${base}.$pf $CTRLDIR/$pf
                 fi
             done
             if [ "$UID" = 0 ]
             then
                 chown -R root.root $TDIR
             else
                     echo "Warning: You are not root. Unable to squash permissions."
             fi