Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/17 16:53:44+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/06/17 16:53:32+02:00 utwente.nl!koen
asterisk_1.0.7.bb:  fix depends, still not 100% correct

2005/06/17 15:44:06+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/06/17 15:43:38+01:00 rpsys.net!RP
xserver-kdrive: Add hack which alters mouse device init order so the touchscreen works...

BKrev: 42b2eedbdMJnte7B7HRlH_b0YHtiDQ

diff --git a/packages/asterisk/asterisk_1.0.7.bb b/packages/asterisk/asterisk_1.0.7.bb
index e69de29..1116849 100644 (file)
--- a/packages/asterisk/asterisk_1.0.7.bb
+++ b/packages/asterisk/asterisk_1.0.7.bb
@@ -0,0 +1,23 @@
+DESCRIPTION="The Astersisk open source software PBX"
+HOMEPAGE="www.asterisk.org"
+LICENSE="GPL"
+SRC_URI="http://www.asterisk.org/html/downloads/asterisk-${PV}.tar.gz \
+         file://makefile.patch;patch=1"
+
+DEPENDS="ncurses zlib openssl"
+
+# Doh - they use 'L'inux intead of linux
+# FIXME:  Do the sed here
+
+export OSARCH="Linux"
+export PROC="${TARGET_ARCH}"
+
+# We will probably have to edit the CFLAG in teh Makefile
+
+do_compile() {
+        oe_runmake
+}
+
+do_install() {
+        oe_runmake DESTDIR=${D} install
+}

diff --git a/packages/xserver/xserver-kdrive/touchscreen_hack.patch b/packages/xserver/xserver-kdrive/touchscreen_hack.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/xserver/xserver-kdrive_20050610.bb b/packages/xserver/xserver-kdrive_20050610.bb
index 4031db9..2c3f3d8 100644 (file)
--- a/packages/xserver/xserver-kdrive_20050610.bb
+++ b/packages/xserver/xserver-kdrive_20050610.bb
@@ -34,6 +34,7 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
        file://kmode.patch;patch=1 \
+       file://touchscreen_hack.patch;patch=1 \
        file://fbdev-not-fix.patch;patch=1"
 
 SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"