Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

7 files changed, 40 insertions, 17 deletions

diff --git a/conf/machine/tx25.conf b/conf/machine/tx25.conf
index abe1135dce..8ec67b0ce6 100644
--- a/conf/machine/tx25.conf
+++ b/conf/machine/tx25.conf
@@ -9,7 +9,7 @@ MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen camer
 GUI_MACHINE_CLASS = "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.30-rc4"
+PREFERRED_VERSION_linux = "2.6.29+2.6.30-rc4"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
 
diff --git a/recipes/cwiid/cwiid_svn.bb b/recipes/cwiid/cwiid_svn.bb
new file mode 100644
index 0000000000..8d134f3f36
--- /dev/null
+++ b/recipes/cwiid/cwiid_svn.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "wiimote library + tools"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://abstrakraft.org/cwiid/"
+
+SRCREV = "192"
+PV = "0.6.00+svnr${SRCREV}"
+
+inherit autotools
+inherit distutils-base
+
+export BUILD_SYS
+export HOST_SYS
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "svn://abstrakraft.org/cwiid/svn/;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
+
+EXTRA_OECONF = "--disable-ldconfig"
+
+FILES_${PN} += "\
+	${sysconfdir}/cwiid/ \
+"
+
+FILES_${PN}-dbg += "\
+	${libdir}/cwiid/plugins/.debug \
+"
+
+do_configure_append() {
+	find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+ 	find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+}
+
+
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig
index 290f8df24c..290f8df24c 100644
--- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/defconfig
+++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch
index b030555df6..b030555df6 100644
--- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch
+++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-git.patch
diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff
index 17765b46f6..17765b46f6 100644
--- a/recipes/linux/linux-2.6.29+2.6.30-rc4/linux-2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff
+++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/linux-2.6.30-rc4-karo.diff
diff --git a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
index 3c79c45a64..8a6599553c 100644
--- a/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
+++ b/recipes/linux/linux_2.6.29+2.6.30-rc4.bb
@@ -18,10 +18,11 @@ DEFAULT_PREFERENCE_poodle = "-1"
 DEFAULT_PREFERENCE_spitz = "-1"
 DEFAULT_PREFERENCE_tosa = "-1"
 DEFAULT_PREFERENCE_afeb9260 = "1"
+DEFAULT_PREFERENCE_tx25 = "1"
 
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/v2.6.30/patch-${KERNEL_RELEASE}.bz2;patch=1 \
            file://defconfig"
 
 SRC_URI_append_afeb9260 = " \
@@ -30,3 +31,6 @@ SRC_URI_append_afeb9260 = " \
         file://0004-AFEB9260-ASoC-driver.patch;patch=1 \
 "
 
+SRC_URI_append_tx25 = " file://linux-2.6.30-rc4-git.patch;patch=1 \
+	file://linux-2.6.30-rc4-karo.diff;patch=1"
+
diff --git a/recipes/linux/linux_2.6.30-rc4.bb b/recipes/linux/linux_2.6.30-rc4.bb
deleted file mode 100644
index d4f7fdd8fe..0000000000
--- a/recipes/linux/linux_2.6.30-rc4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require linux.inc
-
-PV = "2.6.29+2.6.30-rc4"
-
-S = "${WORKDIR}/linux-2.6.30-rc4"
-
-# Mark archs/machines that this kernel supports
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_tx25 = "1"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/linux-${PV}.tar.bz2 \
-           file://defconfig"
-
-SRC_URI_append_tx25 = " linux-2.6.30-rc4-git.patch;patch=1 \
-	file://linux-2.6.30-rc4-karo.diff;patch=1"