11 files changed, 132 insertions, 13 deletions

diff --git a/openembedded/packages/libmatchbox/libmatchbox_svn.bb b/openembedded/packages/libmatchbox/libmatchbox_svn.bb
index 90debcd87b..ebf6dfc3f5 100644
--- a/openembedded/packages/libmatchbox/libmatchbox_svn.bb
+++ b/openembedded/packages/libmatchbox/libmatchbox_svn.bb
@@ -2,9 +2,11 @@ include libmatchbox.inc
 
 PV = "1.7+svn${SRCDATE}"
 DEFAULT_PREFERENCE = "-1"
+PR="1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
-           file://check.m4"
+           file://check.m4 \
+           file://16bppfixes.patch;patch=1"
 S = "${WORKDIR}/libmatchbox"
 
 do_configure_prepend () {
diff --git a/openembedded/packages/lttng/lttng-control_0.1.bb b/openembedded/packages/lttng/lttng-control_0.1.bb
new file mode 100644
index 0000000000..018187741b
--- /dev/null
+++ b/openembedded/packages/lttng/lttng-control_0.1.bb
@@ -0,0 +1,14 @@
+SECTION = "devel"
+DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
+extract program execution details from the Linux operating system and  \
+interpret them."
+LICENSE = "GPL"
+MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
+
+SRC_URI = "http://ltt.polymtl.ca/lttng/ltt-control-${PV}-11032006.tar.gz"
+
+S = "${WORKDIR}/ltt-control-${PV}-11032006"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/ltt-control/facilities/*"        
\ No newline at end of file
diff --git a/openembedded/packages/lttng/lttng-modules-0.12/ltt-modules-fixes.patch b/openembedded/packages/lttng/lttng-modules-0.12/ltt-modules-fixes.patch
new file mode 100644
index 0000000000..68abc7dda4
--- /dev/null
+++ b/openembedded/packages/lttng/lttng-modules-0.12/ltt-modules-fixes.patch
@@ -0,0 +1,59 @@
+Index: ltt-modules-0.12/ltt-statedump.c
+===================================================================
+--- ltt-modules-0.12.orig/ltt-statedump.c       2006-03-09 19:33:38.000000000 +0000
++++ ltt-modules-0.12/ltt-statedump.c    2006-03-22 12:43:30.000000000 +0000
+@@ -19,8 +19,14 @@
+ #include <linux/proc_fs.h>
+ #include <linux/file.h>
+ #include <linux/interrupt.h>
+-#include <linux/irq.h>
+ #include <linux/ltt/ltt-facility-statedump.h>
++#ifndef CONFIG_ARM
++#include <linux/irq.h>
++#else
++#include <asm/mach/irq.h>
++#endif
++
++
+ 
+ #define NB_PROC_CHUNK 20
+ 
+@@ -160,6 +166,7 @@
+        return 0;
+ }
+ 
++#ifndef CONFIG_ARM
+ static inline int ltt_enumerate_interrupts(void)
+ {
+        unsigned int i;
+@@ -182,7 +189,9 @@
+        
+        return 0;
+ }
+-
++#else
++#define ltt_enumerate_interrupts(x)
++#endif
+ 
+ static inline int ltt_enumerate_process_states(void)
+ {
+Index: ltt-modules-0.12/Makefile
+===================================================================
+--- ltt-modules-0.12.orig/Makefile      2006-03-11 18:16:17.000000000 +0000
++++ ltt-modules-0.12/Makefile   2006-03-22 12:39:44.000000000 +0000
+@@ -1,9 +1,7 @@
+-ifneq ($(KERNELRELEASE),)
+ ifneq ($(CONFIG_LTT),)
+        obj-m := ltt-control.o ltt-statedump.o
+ endif
+ 
+-else
+        KERNELDIR ?= /lib/modules/$(shell uname -r)/build
+        PWD := $(shell pwd)
+        KERNELRELEASE = $(shell cat $(KERNELDIR)/$(KBUILD_OUTPUT)/include/linux/version.h | sed -n 's/.*UTS_RELEASE.*\"\(.*\)\".*/\1/p')
+@@ -21,4 +19,4 @@
+ 
+ clean:
+        $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+-endif
++
diff --git a/openembedded/packages/lttng/lttng-modules_0.12.bb b/openembedded/packages/lttng/lttng-modules_0.12.bb
new file mode 100644
index 0000000000..51f6a05ec1
--- /dev/null
+++ b/openembedded/packages/lttng/lttng-modules_0.12.bb
@@ -0,0 +1,22 @@
+SECTION = "devel"
+DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
+extract program execution details from the Linux operating system and  \
+interpret them."
+LICENSE = "GPL"
+MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>"
+
+SRC_URI = "http://ltt.polymtl.ca/lttng/${PN}-${PV}.tar.gz \
+           file://ltt-modules-fixes.patch;patch=1"
+
+S = "${WORKDIR}/ltt-modules-${PV}"
+
+inherit module
+
+export KERNELDIR="${STAGING_KERNEL_DIR}"
+
+do_install() {   
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+}
+
+FILES = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}"        
diff --git a/openembedded/packages/lttng/lttng-viewer_0.8.34-20060317.bb b/openembedded/packages/lttng/lttng-viewer_0.8.34-20060317.bb
new file mode 100644
index 0000000000..b76f8b8116
--- /dev/null
+++ b/openembedded/packages/lttng/lttng-viewer_0.8.34-20060317.bb
@@ -0,0 +1,20 @@
+SECTION = "devel"
+DESCRIPTION = "The Linux trace toolkit is a suite of tools designed to \
+extract program execution details from the Linux operating system and  \
+interpret them."
+LICENSE = "GPL"
+MAINTAINER = "Richrd Purdie <richard@openedhand.com>"
+PR = "r1"
+DEPENDS = "gtk+ pango popt"
+
+ALTNAME = "LinuxTraceToolkitViewer-0.8.34-17032006"
+
+SRC_URI = "http://ltt.polymtl.ca/packages/${ALTNAME}.tar.gz "
+S = "${WORKDIR}/${ALTNAME}"
+
+inherit autotools
+
+FILES_${PN} += "\
+    ${libdir}/lttv/plugins/* \
+    ${datadir}/LinuxTraceToolkitViewer/facilities/* \
+    ${datadir}/LinuxTraceToolkitViewer/pixmaps/* "
diff --git a/openembedded/packages/maemo/nokia770-init_1.0.bb b/openembedded/packages/maemo/nokia770-init_1.0.bb
index 414c4e41c0..84c1e3c279 100644
--- a/openembedded/packages/maemo/nokia770-init_1.0.bb
+++ b/openembedded/packages/maemo/nokia770-init_1.0.bb
@@ -1,6 +1,6 @@
 LICENSE    = "GPL"
 MAINTAINER = "Florian Boor <florian@kernelconcepts.de"
-PR         = "r4"
+PR         = "r5"
 
 DEPENDS    = "base-passwd"
 #RDEPENDS   = "hotplug"
@@ -37,6 +37,6 @@ fi
         ln -sf /mnt/initfs/usr/lib/hotplug/firmware/brf6150fw.bin /lib/firmware/brf6150fw.bin
         ln -sf /mnt/initfs/usr/lib/hotplug/firmware/mtlm3825.arm /lib/firmware/mtlm3825.arm
 
-        rm -rf /lib/modules
-        ln -s /mnt/initfs/lib/modules /lib/modules
+#       rm -rf /lib/modules
+#       ln -s /mnt/initfs/lib/modules /lib/modules
 }
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
index de47b871a2..793672eb65 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ ! -f /etc/pointercal ]; then
-    /usr/bin/xtscal
-fi
+#if [ ! -f /etc/pointercal ]; then
+#    /usr/bin/xtscal
+#fi
 
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
index 49ee0cf580..88b8abbb23 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
@@ -68,6 +68,8 @@ case `module_id` in
                 ARGS="$ARGS -rgba rgb" ;;
         "Generic OMAP1510/1610/1710")
                 ARGS="$ARGS -mouse /dev/input/event0" ;;
+        "ARM-IntegratorCP")
+                ARGS="$ARGS -rgba vrgb"
 esac
 
 exec $XSERVER $ARGS $*
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 16ac1049b6..e1dee0faa2 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
index 3ea41de7f5..633f546117 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index dcafb9e98f..0f64b6c114 100755
--- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -14,10 +14,10 @@ case "$1" in
        /etc/X11/Xserver &
        export DISPLAY=:0
                
-       while [ ! -f /etc/pointercal ]
-       do
-               /usr/bin/xtscal
-       done
+#       while [ ! -f /etc/pointercal ]
+#       do
+#               /usr/bin/xtscal
+#       done
 
        /etc/X11/Xsession &
   ;;