7 files changed, 44 insertions, 8 deletions
diff --git a/packages/connman/connman-gnome_0.4.bb b/packages/connman/connman-gnome_0.4.bb
index fdcf61823d..4f8d6e61f2 100644
--- a/packages/connman/connman-gnome_0.4.bb
+++ b/packages/connman/connman-gnome_0.4.bb
@@ -7,7 +7,7 @@ PR = "r7"
 
 RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi"
 
-SRC_URI = "http://repo.moblin.org/connman/releases/connman-gnome-${PV}.tar.gz \
+SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
            file://phrase-lenght.diff;patch=1 \
            file://connman-applet.desktop"
 
diff --git a/packages/connman/connman_0.10.bb b/packages/connman/connman_0.10.bb
index dfd631b9bf..aff8ccfd92 100644
--- a/packages/connman/connman_0.10.bb
+++ b/packages/connman/connman_0.10.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF += "\
 "
 
 SRC_URI  = "\
-  http://repo.moblin.org/connman/releases/connman-${PV}.tar.gz \
+  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
   file://connman \
 "
 
diff --git a/packages/connman/connman_0.12.bb b/packages/connman/connman_0.12.bb
new file mode 100644
index 0000000000..c2bb92ba83
--- /dev/null
+++ b/packages/connman/connman_0.12.bb
@@ -0,0 +1,36 @@
+require connman.inc
+PR = "r0"
+
+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/packages/connman/connman_0.8.bb b/packages/connman/connman_0.8.bb
index c8f0d2ba55..45fa1b0da9 100644
--- a/packages/connman/connman_0.8.bb
+++ b/packages/connman/connman_0.8.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF += "\
 "
 
 SRC_URI  = "\
-  ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
+  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
   file://connman \
 "
 
diff --git a/packages/connman/connman_0.9.bb b/packages/connman/connman_0.9.bb
index c8f0d2ba55..45fa1b0da9 100644
--- a/packages/connman/connman_0.9.bb
+++ b/packages/connman/connman_0.9.bb
@@ -30,7 +30,7 @@ EXTRA_OECONF += "\
 "
 
 SRC_URI  = "\
-  ftp://ftp.moblin.org/connman/releases/connman-${PV}.tar.gz \
+  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
   file://connman \
 "
 
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index 7b7522fbb7..3a04f5f541 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,11 +1,11 @@
 require connman.inc
-PV = "0.8+gitr${SRCREV}"
-PR = "r1"
+PV = "0.12+gitr${SRCREV}"
+PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "\
-  git://git.moblin.org/repos/projects/connman.git;protocol=http \
+  git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \
   file://connman \
 "
 S = "${WORKDIR}/git"
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index db432dbb70..f892d22fd1 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -21,7 +21,7 @@ PACKAGE_ARCHS := "${REAL_PACKAGE_ARCHS}"
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_OUTPUT2 = "${SDK_DIR}/image-extras"
-SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
 
 IPKG_HOST = "opkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
 IPKG_TARGET = "opkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${SDK_PATH}/${TARGET_SYS}"