7 files changed, 76 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index d8392d1507..d6dd12c9c8 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3910,6 +3910,10 @@ sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405
 md5=7bc5c89870d47c88f407fcfd666c739d
 sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.19.tar.gz]
+md5=3d61c5db55d225c3efbf4c950dc0842f
+sha256=cc4a4b73d8d7b0e19dd2dd274ba91acb67b14c84fc448a921d1359e25e4d2df0
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
 md5=bf48aa07d3c1e5fe272c7f139bc01fc9
 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -23190,6 +23194,10 @@ sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
 md5=b2c104938c1c3eb47e7605432bbd3157
 sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
 
+[http://uim.freedesktop.org/releases/uim/stable/uim-1.3.1.tar.bz2]
+md5=2832e23d4778bbacbfa4b49bf642d667
+sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
+
 [http://uim.googlecode.com/files/uim-1.3.1.tar.bz2]
 md5=2832e23d4778bbacbfa4b49bf642d667
 sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index f58feb686c..8f995899c9 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r1"
+MACHINE_KERNEL_PR = "r2"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/recipes/connman/connman-gnome_git.bb b/recipes/connman/connman-gnome_git.bb
new file mode 100644
index 0000000000..cd244b84ca
--- /dev/null
+++ b/recipes/connman/connman-gnome_git.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "gtk frontend for connman"
+HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
+SECTION = "libs/network"
+LICENSE = "GPL"
+DEPENDS = "gtk+ dbus"
+
+RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi"
+
+PV = "0.5+git"
+PR_append = ".gitr${SRCREV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRCREV = "0059a16915d65880e3f9892a8f0a25f65968260e"
+SRC_URI = "\
+  git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git \
+  file://connman-applet.desktop"
+
+S = "${WORKDIR}/git"
+
+
+inherit autotools gtk-icon-cache
+
+do_install_append() {
+	install -d ${D}${datadir}/applications/
+	install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/
+}
+
diff --git a/recipes/connman/connman_0.19.bb b/recipes/connman/connman_0.19.bb
new file mode 100644
index 0000000000..b8d86613b8
--- /dev/null
+++ b/recipes/connman/connman_0.19.bb
@@ -0,0 +1,35 @@
+require connman.inc
+
+EXTRA_OECONF += "\
+  --disable-gtk-doc \
+  --enable-debug \
+  --enable-threads \
+  --enable-loopback \
+  --enable-ethernet \
+  --enable-wifi \
+  --disable-wimax \
+  --enable-bluetooth \
+  --enable-udhcp \
+  --enable-dhclient \
+  --enable-resolvconf \
+  --enable-dnsproxy \
+  --disable-novatel \
+  --disable-huawei \
+  --disable-hso \
+  --enable-ppp \
+# needs udev >= 129
+  --disable-udev \
+  --disable-polkit \
+  --enable-client \
+  --enable-fake \
+#  --with-udhcpc=PROGRAM \
+#  --with-dhclient=PROGRAM \
+#  --with-resolvconf=PROGRAM \
+#  --with-pppd=PROGRAM \
+"
+
+SRC_URI  = "\
+  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
+  file://connman \
+"
+
diff --git a/recipes/connman/files/connman-applet.desktop b/recipes/connman/files/connman-applet.desktop
index ad17682507..83d96ee67d 100644
--- a/recipes/connman/files/connman-applet.desktop
+++ b/recipes/connman/files/connman-applet.desktop
@@ -6,5 +6,5 @@ Icon=stock_internet
 Exec=connman-applet
 Terminal=false
 Type=Application
-Categories=Network;GTK
+Categories=Network;GTK;
 
diff --git a/recipes/linux/linux-kirkwood_2.6.29.1.bb b/recipes/linux/linux-kirkwood_2.6.29.2.bb
index 531f520497..0e349362db 100644
--- a/recipes/linux/linux-kirkwood_2.6.29.1.bb
+++ b/recipes/linux/linux-kirkwood_2.6.29.2.bb
@@ -6,11 +6,11 @@ COMPATIBLE_MACHINE = "sheevaplug"
 require linux.inc
 
 # Change MACHINE_KERNEL_PR in conf/machine/include/kirkwood.inc
-PV = "2.6.29.1"
+PV = "2.6.29.2"
 PR_append = "+gitr${SRCREV}"
 #PV = "2.6.28+2.6.29rc7-${PR}+gitr${SRCREV}"
 
-SRCREV = "f66f1d49e6d8617a07b07681c684083e48547eef"
+SRCREV = "10a12868405319fbf114af2bde9789aa64c34144"
 SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \
            file://fw.patch;patch=1 \
            file://defconfig \
diff --git a/recipes/mtd/mtd-utils-native_1.2.0+git.bb b/recipes/mtd/mtd-utils-native_1.2.0+git.bb
index 6135d7f4d0..85692a0e91 100644
--- a/recipes/mtd/mtd-utils-native_1.2.0+git.bb
+++ b/recipes/mtd/mtd-utils-native_1.2.0+git.bb
@@ -1,5 +1,6 @@
 # Doesn't build for everyone, errors range from missing includes to linking errors
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
 
 require mtd-utils_${PV}.bb
 require mtd-utils-native.inc