Merge remote-tracking branch 'origin/master' into aldot/fixes

11 files changed, 73 insertions, 33 deletions

diff --git a/conf/machine/include/palmpre.inc b/conf/machine/include/palmpre.inc
index 3132ba8e8c..64f2ebd1fe 100644
--- a/conf/machine/include/palmpre.inc
+++ b/conf/machine/include/palmpre.inc
@@ -34,7 +34,6 @@ MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone blueto
 MACHINE_EXTRA_RDEPENDS = " \
  tsmd \
  read-tokens \
- tellbootie \
  lvm2 \
  palmpre-audio-scripts \
  compat-wireless-2.6-old \
diff --git a/recipes/connman/connman_0.73.bb b/recipes/connman/connman_0.73.bb
new file mode 100644
index 0000000000..103b5b60be
--- /dev/null
+++ b/recipes/connman/connman_0.73.bb
@@ -0,0 +1,31 @@
+require connman.inc
+# connman requires libXtables now
+DEPENDS += "iptables"
+PR = "r0"
+
+EXTRA_OECONF += "\
+  --disable-gtk-doc \
+  --enable-debug \
+  --enable-threads \
+  --enable-loopback \
+  --enable-ethernet \
+  --enable-wifi \
+  --disable-wimax \
+  --enable-bluetooth \
+  --enable-ofono \
+  --enable-resolvconf \
+  --enable-dnsproxy \
+  --enable-tools \
+  --disable-polkit \
+  --enable-client \
+  --enable-fake \
+"
+
+SRC_URI  = "\
+  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
+  file://link-against-libnl2.patch \
+  file://connman \
+"
+
+SRC_URI[md5sum] = "01085b2ed8f7b11a41724f1528720cc7"
+SRC_URI[sha256sum] = "b71ff2c3925ea82a7ebf818685f809e595d5c47d767005dfb149c6264b098417"
diff --git a/recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch b/recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch
index 72e7528b0e..72e7528b0e 100644
--- a/recipes/fakeroot/fakeroot-1.14.5/fix-prefix.patch
+++ b/recipes/fakeroot/fakeroot-1.15.1/fix-prefix.patch
diff --git a/recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch b/recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch
index bcb9083998..bcb9083998 100644
--- a/recipes/fakeroot/fakeroot-1.14.5/quiet-getopt-check.patch
+++ b/recipes/fakeroot/fakeroot-1.15.1/quiet-getopt-check.patch
diff --git a/recipes/fakeroot/fakeroot_1.14.5.bb b/recipes/fakeroot/fakeroot_1.15.1.bb
index ff6844df6b..4c625caeb6 100644
--- a/recipes/fakeroot/fakeroot_1.14.5.bb
+++ b/recipes/fakeroot/fakeroot_1.15.1.bb
@@ -6,5 +6,5 @@ SRC_URI =+ "\
   file://quiet-getopt-check.patch \
 "
 
-SRC_URI[md5sum] = "659a1f3a36554abfc2a3eaad2fdc0604"
-SRC_URI[sha256] = "b035c834944bf9482027f48c388de8492e96609825265ac03f05408d0b3aae68"
+SRC_URI[md5sum] = "248c408b1e06e776c5739871b49bd968"
+SRC_URI[sha256sum] = "45fbb9ad611f33224cc09954963dde563cc80fe58c76feb25b6e98550b81729a"
diff --git a/recipes/lsb/lsb-base_3.2.bb b/recipes/lsb/lsb-base_3.2.bb
index 213f3de18b..5126af38ed 100644
--- a/recipes/lsb/lsb-base_3.2.bb
+++ b/recipes/lsb/lsb-base_3.2.bb
@@ -5,7 +5,7 @@ PR = "r0"
 LICENSE = "BSD"
 PACKAGE_ARCH = "all"
 
-SRC_URI = "http://ftp.de.debian.org/debian/pool/main/l/lsb/lsb_3.2-23.tar.gz"
+SRC_URI = "http://ftp.de.debian.org/debian/pool/main/l/lsb/lsb_3.2-27.tar.gz"
 
 FILES_${PN} = "/lib/lsb"
 
@@ -18,3 +18,6 @@ do_install () {
 	install -d ${D}/lib/lsb
 	install -m 755 init-functions ${D}/lib/lsb/
 }
+
+SRC_URI[md5sum] = "eb22ef00c02d60e7cd5b9070c8fadd98"
+SRC_URI[sha256sum] = "15d7e2ba0a54c809442952c676f7b30d00a9a0207a3ddcc4ae7aaea830eccc08"
diff --git a/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch
index a923da58cd..6560d7ca92 100644
--- a/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch
+++ b/recipes/networkmanager/networkmanager/0001-respect-libnl-flags-also-in-backends-ip6-manager.patch
@@ -1,7 +1,7 @@
-From 9d6414375e2371086dcfadc1d117fbcfe43fb3fc Mon Sep 17 00:00:00 2001
+From 8b201faa65b23a1d2c3c1cedc80b40ba26e91be7 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Wed, 23 Mar 2011 17:27:54 +0100
-Subject: [PATCH] respect libnl flags also in backends/ip6-manager
+Subject: [PATCH 1/2] respect libnl flags also in backends/ip6-manager
 
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
@@ -47,5 +47,5 @@ index b56b197..b98d6de 100644
  	$(GLIB_LIBS)
  
 -- 
-1.7.4.1
+1.7.3.4
 
diff --git a/recipes/networkmanager/networkmanager/0002-respect-libnl-flags-also-in-dns-manager.patch b/recipes/networkmanager/networkmanager/0002-respect-libnl-flags-also-in-dns-manager.patch
new file mode 100644
index 0000000000..ede777fab3
--- /dev/null
+++ b/recipes/networkmanager/networkmanager/0002-respect-libnl-flags-also-in-dns-manager.patch
@@ -0,0 +1,32 @@
+From f7ff232d2c335eec5192b23861d8bfa2fd098425 Mon Sep 17 00:00:00 2001
+From: Philip Balister <philip@opensdr.com>
+Date: Wed, 4 May 2011 18:24:49 -0400
+Subject: [PATCH 2/2] respect-libnl-flags-also-in-dns-manager
+
+Signed-off-by: Philip Balister <philip@balister.org>
+---
+ src/dns-manager/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
+index 7b5fc4f..b51f667 100644
+--- a/src/dns-manager/Makefile.am
++++ b/src/dns-manager/Makefile.am
+@@ -19,12 +19,14 @@ libdns_manager_la_SOURCES = \
+ 	nm-dns-utils.c
+ 
+ libdns_manager_la_CPPFLAGS = \
++	$(LIBNL_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(GLIB_CFLAGS) \
+ 	-DLOCALSTATEDIR=\"$(localstatedir)\"
+ 
+ libdns_manager_la_LIBADD = \
+ 	$(top_builddir)/src/logging/libnm-logging.la \
++	$(LIBNL_LIBS) \
+ 	$(DBUS_LIBS) \
+ 	$(GLIB_LIBS)
+ 
+-- 
+1.7.3.4
+
diff --git a/recipes/networkmanager/networkmanager_git.bb b/recipes/networkmanager/networkmanager_git.bb
index 81a2ad585b..8187787d11 100644
--- a/recipes/networkmanager/networkmanager_git.bb
+++ b/recipes/networkmanager/networkmanager_git.bb
@@ -20,6 +20,7 @@ SRC_URI += " \
     file://NetworkManager \
     file://gtk-doc.make \
     file://0001-respect-libnl-flags-also-in-backends-ip6-manager.patch \
+    file://0002-respect-libnl-flags-also-in-dns-manager.patch \
 "
 
 EXTRA_OECONF += " --with-dhclient=${base_sbindir}/dhclient \
diff --git a/recipes/palmpre/palmpre-system-deps-native_git.bb b/recipes/palmpre/palmpre-system-deps-native_git.bb
deleted file mode 100644
index 1f907c9a59..0000000000
--- a/recipes/palmpre/palmpre-system-deps-native_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Important header and vapi files for some programs running on the palmpre machine"
-HOMEPAGE = "http://www.freesmartphone.org"
-AUTHOR = "Simon Busch <morphis@gravedo.de>
-SECTION = "console/utils"
-LICENSE = "GPL"
-PR = "r0"
-
-SRCREV = "93a640dafa8ebebdb1a03f051cb1b566629b227c"
-SRC_URI = "${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/palmpre/palmpre-system-deps"
-
-inherit autotools native pkgconfig
diff --git a/recipes/palmpre/tellbootie_git.bb b/recipes/palmpre/tellbootie_git.bb
deleted file mode 100644
index 65c0cd6abb..0000000000
--- a/recipes/palmpre/tellbootie_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Little utility to tell the bootloader of the palmpre to reboot/reset in bootloader mode; palmpre machine specific"
-HOMEPAGE = "http://www.freesmartphone.org"
-AUTHOR = "Simon Busch <morphis@gravedo.de>
-SECTION = "console/utils"
-LICENSE = "GPL"
-PR = "r0"
-
-SRCREV = "93a640dafa8ebebdb1a03f051cb1b566629b227c"
-SRC_URI = "${FREESMARTPHONE_GIT}/utilities.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/palmpre/tellbootie"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-inherit autotools