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

11 files changed, 71 insertions, 13 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 815726872f..9d578c1587 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3758,6 +3758,14 @@ sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
 md5=094743343e062ea370fcd461aa48a7fe
 sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.10.tar.gz]
+md5=094743343e062ea370fcd461aa48a7fe
+sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
+
+[http://www.kernel.org/pub/linux/network/connman/connman-0.12.tar.gz]
+md5=c0d27961dbdcb92b79dfde9c532dd348
+sha256=2dda1ba0d18e2b6de5fddd33a18324c8e75cddfc7df61595babfc19931fa4507
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
 md5=bf48aa07d3c1e5fe272c7f139bc01fc9
 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -3770,10 +3778,18 @@ sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de
 md5=3f1995bf91846b601a25a37832c88cb6
 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.8.tar.gz]
+md5=3f1995bf91846b601a25a37832c88cb6
+sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.9.tar.gz]
 md5=a5ebd17ff19e8f9b4d5e783d345d135b
 sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.9.tar.gz]
+md5=a5ebd17ff19e8f9b4d5e783d345d135b
+sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
+
 [ftp://ftp.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
 md5=c9a3b384f080ed4cdf139ce9377ef2c8
 sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
@@ -3782,6 +3798,10 @@ sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
 md5=c9a3b384f080ed4cdf139ce9377ef2c8
 sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
 
+[http://www.kernel.org/pub/linux/network/connman/connman-gnome-0.4.tar.gz]
+md5=c9a3b384f080ed4cdf139ce9377ef2c8
+sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
+
 [http://www.conserver.com/conserver-8.1.14.tar.gz]
 md5=f7825728e5af8992ed4a99fb560a3df8
 sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 2c3b338cce..77efba7a1e 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -65,7 +65,7 @@ PREFERRED_VERSION_avetanabt ?= "20060413"
 PREFERRED_VERSION_bacula-client ?= "1.38.11"
 PREFERRED_VERSION_balsa ?= "2.0.17"
 PREFERRED_VERSION_base-files ?= "3.0.14"
-PREFERRED_VERSION_base-passwd ?= "3.5.9"
+PREFERRED_VERSION_base-passwd ?= "3.5.20"
 PREFERRED_VERSION_bash ?= "3.2"
 PREFERRED_VERSION_bash-completion ?= "20040711"
 PREFERRED_VERSION_bazaar ?= "1.2"
@@ -828,7 +828,7 @@ PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42"
 PREFERRED_VERSION_libcontactsdb ?= "0.5"
 PREFERRED_VERSION_libcroco ?= "0.6.1"
 PREFERRED_VERSION_libcwd ?= "0.99.47"
-PREFERRED_VERSION_libdaemon ?= "0.12"
+PREFERRED_VERSION_libdaemon ?= "0.13"
 PREFERRED_VERSION_libdata-optlist-perl ?= "0.101"
 PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101"
 PREFERRED_VERSION_libdbi ?= "0.7.2"
@@ -1650,7 +1650,7 @@ PREFERRED_VERSION_reiser4progs ?= "1.0.4"
 PREFERRED_VERSION_reiserfsprogs ?= "3.6.19"
 PREFERRED_VERSION_renderproto ?= "0.9.3"
 PREFERRED_VERSION_resistorui ?= "0.9"
-PREFERRED_VERSION_resolvconf ?= "1.28"
+PREFERRED_VERSION_resolvconf ?= "1.43"
 PREFERRED_VERSION_resourceext ?= "1.0"
 PREFERRED_VERSION_resourceproto ?= "1.0.2"
 PREFERRED_VERSION_rfakeap ?= "0.2"
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index b5f7ddc1e4..196018b431 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -43,7 +43,7 @@ INHERIT += "packaged-staging"
 #############################################################################
 # Chose the packaging system
 INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.gz jffs2"
+IMAGE_FSTYPES ?= "tar.gz jffs2"
 
 require conf/distro/include/sane-feed.inc
 PREFERRED_PKG_FORMAT ?= "ipk"
diff --git a/conf/enterprise.conf b/conf/enterprise.conf
index a1e0d70691..035abe611b 100644
--- a/conf/enterprise.conf
+++ b/conf/enterprise.conf
@@ -1,2 +1,4 @@
 # For the enterprise edition we want to avoid certain packages by default.
-BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', '(mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|python-mad|opie-mediaplayer1-libmadplugin|ffmpeg|mplayer)', '', d)}"
+BBMASK ?= ""
+OLDBBMASK := "${BBMASK}"
+BBMASK = "${@base_conditional('ENTERPRISE_DISTRO', '1', base_conditional('OLDBBMASK', '', '', '(${OLDBBMASK})|', d) + '(mp3blaster|mpg123|mpg321|smpeg|liba52|lame|libmad|mpeg2dec|xmms-mad|madplay|python-mad|opie-mediaplayer1-libmadplugin|ffmpeg|mplayer)', '${OLDBBMASK}', d)}"
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}"