From 84e5d581226ab5daf72722214bc58c35c1bdfe7f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 20 Jun 2012 12:27:20 +0100 Subject: connman: upgrade to 1.0 Drop patches that have been merged upstream, or are not relevant any more. License checksums changed because the (C) years were updated. (From OE-Core rev: d7e7d38a2beded17937e330adf4edb89807bfdd4) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/connman/connman.inc | 4 +- .../connman/connman/disable_alg-test.patch | 46 ------------------ .../connman/connman/ethernet_default.patch | 22 --------- .../connman/test-set-ipv4-method-api-fix.patch | 50 -------------------- .../connman/test-set-ipv6-method-api-fix.patch | 55 ---------------------- meta/recipes-connectivity/connman/connman_0.79.bb | 14 ------ meta/recipes-connectivity/connman/connman_1.0.bb | 10 ++++ 7 files changed, 12 insertions(+), 189 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch delete mode 100644 meta/recipes-connectivity/connman/connman/ethernet_default.patch delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch delete mode 100644 meta/recipes-connectivity/connman/connman_0.79.bb create mode 100644 meta/recipes-connectivity/connman/connman_1.0.bb (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 7215f2564b..ae26689d5d 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -11,7 +11,7 @@ HOMEPAGE = "http://connman.net/" BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e" + file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d" # we need to define the depends here, the dynamic stuff is too late DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ @@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ " -INC_PR = "r8" +INC_PR = "r9" TIST = "--enable-tist" TIST_powerpc = "" diff --git a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch b/meta/recipes-connectivity/connman/connman/disable_alg-test.patch deleted file mode 100644 index f5cea0047d..0000000000 --- a/meta/recipes-connectivity/connman/connman/disable_alg-test.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3ebba424d56919018733064ad9e0ab8790d2bf1d Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Fri, 16 Dec 2011 19:31:59 -0200 -Subject: [PATCH] Disable building of alg-test - -alg-test utility depends on linux/if_alg.h header that is only -available on kernels >= 2.6.39. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Otavio Salvador ---- - Makefile.am | 2 +- - configure.ac | 3 --- - 2 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index a6509f1..93618a3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -145,7 +145,7 @@ noinst_PROGRAMS += tools/wispr tools/supplicant-test \ - tools/dbus-test tools/polkit-test \ - tools/iptables-test tools/tap-test tools/wpad-test \ - tools/stats-tool tools/private-network-test \ -- tools/alg-test unit/test-session unit/test-ippool \ -+ unit/test-session unit/test-ippool \ - unit/test-nat - - tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c -diff --git a/configure.ac b/configure.ac -index 3dca02e..3b2da4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -419,9 +419,6 @@ if (test "${enable_tools}" = "yes"); then - AC_MSG_ERROR(GnuTLS library is required)) - AC_SUBST(GNUTLS_CFLAGS) - AC_SUBST(GNUTLS_LIBS) -- -- AC_CHECK_HEADERS(linux/if_alg.h, dummy=yes, -- AC_MSG_ERROR(User-space algorithm header files are required)) - fi - AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes") - --- -1.7.9.1 - diff --git a/meta/recipes-connectivity/connman/connman/ethernet_default.patch b/meta/recipes-connectivity/connman/connman/ethernet_default.patch deleted file mode 100644 index 6dae2aa0c8..0000000000 --- a/meta/recipes-connectivity/connman/connman/ethernet_default.patch +++ /dev/null @@ -1,22 +0,0 @@ -Default to enabling the ethernet interface. If we don't do this, connman -will shut down all the networking when it starts without any configuration -which is usualy not what the users expects. This is particularly -problematic with our qemu images and runtime testing using qemu. - -Upstream-Status: Inappropriate [Configuration] - -RP 2011/12/12 - -Index: git/src/storage.c -=================================================================== ---- git.orig/src/storage.c 2011-12-12 16:14:10.892316565 +0000 -+++ git/src/storage.c 2011-12-12 16:14:13.788316431 +0000 -@@ -367,7 +367,7 @@ - "Enable", FALSE); - - g_key_file_set_boolean(keyfile, "Wired", -- "Enable", FALSE); -+ "Enable", TRUE); - - g_key_file_set_boolean(keyfile, "3G", - "Enable", FALSE); diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch deleted file mode 100644 index 78eb19a770..0000000000 --- a/meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0b817dd3096f5c3ca8f0b868ee55ea550054137b Mon Sep 17 00:00:00 2001 -From: Daniel Wagner -Date: Mon, 19 Mar 2012 14:03:27 +0100 -Subject: [PATCH 3/3] set-ipv4-method: The arguments have to be wrapped into a - variant - -Fixes BMC#24986 - -Upstream-Status: Backport - -Signed-off-by: Otavio Salvador ---- - test/set-ipv4-method | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/test/set-ipv4-method b/test/set-ipv4-method -index 820b24b..235113f 100755 ---- a/test/set-ipv4-method -+++ b/test/set-ipv4-method -@@ -3,6 +3,9 @@ - import sys - import dbus - -+def make_variant(string): -+ return dbus.String(string, variant_level=1) -+ - def print_usage(): - print "Usage: %s [off|dhcp|manual
[netmask] [gateway]]" % (sys.argv[0]) - -@@ -20,13 +23,13 @@ properties = service.GetProperties() - - print "Setting method %s for %s" % (sys.argv[2], sys.argv[1]) - --ipv4_configuration = { "Method": sys.argv[2] } -+ipv4_configuration = { "Method": make_variant(sys.argv[2]) } - if (len(sys.argv) > 3): -- ipv4_configuration["Address"] = sys.argv[3] -+ ipv4_configuration["Address"] = make_variant(sys.argv[3]) - if (len(sys.argv) > 4): -- ipv4_configuration["Netmask"] = sys.argv[4] -+ ipv4_configuration["Netmask"] = make_variant(sys.argv[4]) - if (len(sys.argv) > 5): -- ipv4_configuration["Gateway"] = sys.argv[5] -+ ipv4_configuration["Gateway"] = make_variant(sys.argv[5]) - - service.SetProperty("IPv4.Configuration", ipv4_configuration) - print "New IPv4.Configuration: ", ipv4_configuration --- -1.7.9.5 - diff --git a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch b/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch deleted file mode 100644 index 773127bcec..0000000000 --- a/meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2885e71c9c0df7ea9866e91ab79d255eaa8de53d Mon Sep 17 00:00:00 2001 -From: Daniel Wagner -Date: Mon, 19 Mar 2012 14:03:28 +0100 -Subject: [PATCH 2/3] set-ipv6-method: The arguments have to be wrapped into a - variant - -Fixes BMC#24986 - -Upstream-Status: Backport - -Signed-off-by: Otavio Salvador ---- - test/set-ipv6-method | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/test/set-ipv6-method b/test/set-ipv6-method -index 7f60b88..4f2de09 100755 ---- a/test/set-ipv6-method -+++ b/test/set-ipv6-method -@@ -3,6 +3,9 @@ - import sys - import dbus - -+def make_variant(string): -+ return dbus.String(string, variant_level=1) -+ - def print_usage(): - print "Usage: %s off|manual|auto [
[prefixlen] [gateway]] []" % (sys.argv[0]) - -@@ -19,17 +22,17 @@ properties = service.GetProperties() - - print "Setting method %s for %s" % (sys.argv[2], sys.argv[1]) - --ipv6_configuration = { "Method": sys.argv[2] } -+ipv6_configuration = { "Method": make_variant(sys.argv[2])} - if sys.argv[2] == "auto": - if (len(sys.argv) > 3): -- ipv6_configuration["Privacy"] = sys.argv[3] -+ ipv6_configuration["Privacy"] = make_variant(sys.argv[3]) - else: - if (len(sys.argv) > 3): -- ipv6_configuration["Address"] = sys.argv[3] -+ ipv6_configuration["Address"] = make_variant(sys.argv[3]) - if (len(sys.argv) > 4): -- ipv6_configuration["PrefixLength"] = sys.argv[4] -+ ipv6_configuration["PrefixLength"] = make_variant(sys.argv[4]) - if (len(sys.argv) > 5): -- ipv6_configuration["Gateway"] = sys.argv[5] -+ ipv6_configuration["Gateway"] = make_variant(sys.argv[5]) - - service.SetProperty("IPv6.Configuration", ipv6_configuration) - print "New IPv6.Configuration: ", ipv6_configuration --- -1.7.9.5 - diff --git a/meta/recipes-connectivity/connman/connman_0.79.bb b/meta/recipes-connectivity/connman/connman_0.79.bb deleted file mode 100644 index 898fb11f07..0000000000 --- a/meta/recipes-connectivity/connman/connman_0.79.bb +++ /dev/null @@ -1,14 +0,0 @@ -require connman.inc - -# 0.79 tag -SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c" -SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ - file://add_xuser_dbus_permission.patch \ - file://ethernet_default.patch \ - file://disable_alg-test.patch \ - file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ - file://test-set-ipv4-method-api-fix.patch \ - file://test-set-ipv6-method-api-fix.patch \ - file://connman" -S = "${WORKDIR}/git" -PR = "${INC_PR}.0" diff --git a/meta/recipes-connectivity/connman/connman_1.0.bb b/meta/recipes-connectivity/connman/connman_1.0.bb new file mode 100644 index 0000000000..926d22e711 --- /dev/null +++ b/meta/recipes-connectivity/connman/connman_1.0.bb @@ -0,0 +1,10 @@ +require connman.inc + +# 1.0 tag +SRCREV = "6d6f312fb2b751b4cf7037f2a526c7785364732f" +SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git \ + file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ + file://add_xuser_dbus_permission.patch \ + file://connman" +S = "${WORKDIR}/git" +PR = "${INC_PR}.0" -- cgit v1.2.3-54-g00ecf