* [PATCH 0/6] ConnMan 1.0 upgrade
@ 2012-06-20 11:26 Ross Burton
2012-06-20 11:27 ` [PATCH 1/6] connman: rationalise configure options Ross Burton
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Ross Burton @ 2012-06-20 11:26 UTC (permalink / raw)
To: openembedded-core
Same as before, but I signed it all off this time.
The following changes since commit e0a70547069fe7e8a2d6bdaffc985fb172d46c31:
perl: Allow perl to cross build and native build in a directory named "t" (2012-06-18 17:33:04 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/connman
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ross/connman
Ross Burton (6):
connman: rationalise configure options
connman: add compat RPROVIDES for older packaging
connman: upgrade to 1.0
connman-gnome: fix build depends (Yocto #2556)
connman-gnome: clean up runtime dependencies
connman-gnome: upgrade to 0.7, which works with connman 1.0
.../connman/connman-gnome_0.5.bb | 38 --------------
.../connman/connman-gnome_0.7.bb | 19 +++++++
meta/recipes-connectivity/connman/connman.inc | 27 +++++++---
.../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 --------------------
.../connman/{connman_0.79.bb => connman_1.0.bb} | 10 +---
8 files changed, 41 insertions(+), 226 deletions(-)
delete mode 100644 meta/recipes-connectivity/connman/connman-gnome_0.5.bb
create mode 100644 meta/recipes-connectivity/connman/connman-gnome_0.7.bb
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
rename meta/recipes-connectivity/connman/{connman_0.79.bb => connman_1.0.bb} (53%)
--
1.7.7.6
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/6] connman: rationalise configure options
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
@ 2012-06-20 11:27 ` Ross Burton
2012-06-20 11:27 ` [PATCH 2/6] connman: add compat RPROVIDES for older packaging Ross Burton
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2012-06-20 11:27 UTC (permalink / raw)
To: openembedded-core
dnsproxy and ntpd don't exist anymore, and the client is almost entirely useless.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 3412323..7a10615 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
"
-INC_PR = "r6"
+INC_PR = "r7"
TIST = "--enable-tist"
TIST_powerpc = ""
@@ -35,14 +35,12 @@ EXTRA_OECONF += "\
--enable-ethernet \
${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
- --enable-dnsproxy \
${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \
--enable-tools \
--enable-test \
--disable-polkit \
- --enable-client \
+ --disable-client \
--enable-fake \
- --disable-ntpd \
"
INITSCRIPT_NAME = "connman"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/6] connman: add compat RPROVIDES for older packaging
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
2012-06-20 11:27 ` [PATCH 1/6] connman: rationalise configure options Ross Burton
@ 2012-06-20 11:27 ` Ross Burton
2012-06-20 11:27 ` [PATCH 3/6] connman: upgrade to 1.0 Ross Burton
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2012-06-20 11:27 UTC (permalink / raw)
To: openembedded-core
wifi, bluetooth and 3g used to be plugins so were packaged separately, but not
anymore.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7a10615..7215f25 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
"
-INC_PR = "r7"
+INC_PR = "r8"
TIST = "--enable-tist"
TIST_powerpc = ""
@@ -74,13 +74,26 @@ do_install_append() {
rmdir ${D}${libdir}/connman/scripts
}
+# These used to be plugins, but now they are core
+RPROVIDES_${PN} = "\
+ connman-plugin-loopback \
+ connman-plugin-ethernet \
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth','connman-plugin-bluetooth', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'wifi','connman-plugin-wifi', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', '3g','connman-plugin-ofono', '', d)} \
+ "
+
+RDEPENDS_${PN} = "\
+ ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
+ "
+
PACKAGES_DYNAMIC = "${PN}-plugin-*"
python populate_packages_prepend() {
depmap = dict( pppd="ppp",
- wifi="wpa-supplicant",
- bluetooth="bluez4",
- ofono="ofono" )
+ )
packages = []
multilib_prefix = (d.getVar("MLPREFIX", True) or "")
hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/6] connman: upgrade to 1.0
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
2012-06-20 11:27 ` [PATCH 1/6] connman: rationalise configure options Ross Burton
2012-06-20 11:27 ` [PATCH 2/6] connman: add compat RPROVIDES for older packaging Ross Burton
@ 2012-06-20 11:27 ` Ross Burton
2012-06-20 11:27 ` [PATCH 4/6] connman-gnome: fix build depends (Yocto #2556) Ross Burton
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2012-06-20 11:27 UTC (permalink / raw)
To: openembedded-core
Drop patches that have been merged upstream, or are not relevant any more.
License checksums changed because the (C) years were updated.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
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 --------------------
.../connman/{connman_0.79.bb => connman_1.0.bb} | 10 +---
6 files changed, 5 insertions(+), 182 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
rename meta/recipes-connectivity/connman/{connman_0.79.bb => connman_1.0.bb} (53%)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7215f25..ae26689 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 f5cea00..0000000
--- 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 <otavio@ossystems.com.br>
-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 <otavio@ossystems.com.br>
----
- 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 6dae2aa..0000000
--- 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 78eb19a..0000000
--- 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 <daniel.wagner@bmw-carit.de>
-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 <otavio@ossystems.com.br>
----
- 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 <service> [off|dhcp|manual <address> [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 773127b..0000000
--- 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 <daniel.wagner@bmw-carit.de>
-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 <otavio@ossystems.com.br>
----
- 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 <service> off|manual|auto [<address> [prefixlen] [gateway]] [<privacy>]" % (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_1.0.bb
similarity index 53%
rename from meta/recipes-connectivity/connman/connman_0.79.bb
rename to meta/recipes-connectivity/connman/connman_1.0.bb
index 898fb11..926d22e 100644
--- a/meta/recipes-connectivity/connman/connman_0.79.bb
+++ b/meta/recipes-connectivity/connman/connman_1.0.bb
@@ -1,14 +1,10 @@
require connman.inc
-# 0.79 tag
-SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c"
+# 1.0 tag
+SRCREV = "6d6f312fb2b751b4cf7037f2a526c7785364732f"
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://add_xuser_dbus_permission.patch \
file://connman"
S = "${WORKDIR}/git"
PR = "${INC_PR}.0"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/6] connman-gnome: fix build depends (Yocto #2556)
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
` (2 preceding siblings ...)
2012-06-20 11:27 ` [PATCH 3/6] connman: upgrade to 1.0 Ross Burton
@ 2012-06-20 11:27 ` Ross Burton
2012-06-20 11:27 ` [PATCH 5/6] connman-gnome: clean up runtime dependencies Ross Burton
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2012-06-20 11:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../connman/connman-gnome_0.5.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index e2e8deb..a4327f5 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
-DEPENDS = "gtk+ dbus"
+DEPENDS = "gtk+ dbus-glib"
-PR = "r10"
+PR = "r11"
SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/6] connman-gnome: clean up runtime dependencies
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
` (3 preceding siblings ...)
2012-06-20 11:27 ` [PATCH 4/6] connman-gnome: fix build depends (Yocto #2556) Ross Burton
@ 2012-06-20 11:27 ` Ross Burton
2012-06-20 11:27 ` [PATCH 6/6] connman-gnome: upgrade to 0.7, which works with connman 1.0 Ross Burton
2012-06-21 12:23 ` [PATCH 0/6] ConnMan 1.0 upgrade Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2012-06-20 11:27 UTC (permalink / raw)
To: openembedded-core
There is no need to recommend Python as it isn't used, and specifying the connman plugins should be done by the image.
Add a dependency on connman itself as otherwise connman-gnome doesn't do much.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../connman/connman-gnome_0.5.bb | 15 ++-------------
1 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index a4327f5..8a6878c 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
DEPENDS = "gtk+ dbus-glib"
-PR = "r11"
+PR = "r12"
SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
@@ -24,15 +24,4 @@ S = "${WORKDIR}/git"
inherit autotools gtk-icon-cache
-RRECOMMENDS_${PN} = "python \
- python-dbus \
- connman \
- connman-plugin-ethernet \
- connman-plugin-loopback \
- connman-plugin-udhcp \
- connman-plugin-wifi \
- connman-plugin-fake \
- connman-plugin-bluetooth \
- connman-plugin-dnsproxy \
- connman-plugin-ofono \
- "
+RDEPENDS_${PN} = "connman"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/6] connman-gnome: upgrade to 0.7, which works with connman 1.0
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
` (4 preceding siblings ...)
2012-06-20 11:27 ` [PATCH 5/6] connman-gnome: clean up runtime dependencies Ross Burton
@ 2012-06-20 11:27 ` Ross Burton
2012-06-21 12:23 ` [PATCH 0/6] ConnMan 1.0 upgrade Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2012-06-20 11:27 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../{connman-gnome_0.5.bb => connman-gnome_0.7.bb} | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
rename meta/recipes-connectivity/connman/{connman-gnome_0.5.bb => connman-gnome_0.7.bb} (45%)
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
similarity index 45%
rename from meta/recipes-connectivity/connman/connman-gnome_0.5.bb
rename to meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index 8a6878c..6cceb2d 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb
@@ -8,17 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
DEPENDS = "gtk+ dbus-glib"
-PR = "r12"
-
-SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
-SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
- file://0001-Monitor-the-Manager-s-State-property.patch \
- file://0002-Update-for-ConnMan-0.79-API-changes.patch \
- file://0003-Fix-setting-IPv4-configuration.patch \
- file://0004-Handle-WiFi-authentication-using-an-agent.patch \
- file://0005-Remove-all-handling-of-Passphrase-property.patch \
- file://0006-Fix-status-descriptions-in-properties-tree.patch \
- file://0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch"
+# 0.7 tag
+SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
+SRC_URI = "git://github.com/connectivity/connman-gnome.git;protocol=git"
S = "${WORKDIR}/git"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/6] ConnMan 1.0 upgrade
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
` (5 preceding siblings ...)
2012-06-20 11:27 ` [PATCH 6/6] connman-gnome: upgrade to 0.7, which works with connman 1.0 Ross Burton
@ 2012-06-21 12:23 ` Richard Purdie
6 siblings, 0 replies; 8+ messages in thread
From: Richard Purdie @ 2012-06-21 12:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-06-20 at 12:26 +0100, Ross Burton wrote:
> Same as before, but I signed it all off this time.
>
> The following changes since commit e0a70547069fe7e8a2d6bdaffc985fb172d46c31:
>
> perl: Allow perl to cross build and native build in a directory named "t" (2012-06-18 17:33:04 +0100)
>
> are available in the git repository at:
> git://git.yoctoproject.org/poky-contrib ross/connman
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ross/connman
>
> Ross Burton (6):
> connman: rationalise configure options
> connman: add compat RPROVIDES for older packaging
> connman: upgrade to 1.0
> connman-gnome: fix build depends (Yocto #2556)
> connman-gnome: clean up runtime dependencies
> connman-gnome: upgrade to 0.7, which works with connman 1.0
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-06-21 12:33 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-20 11:26 [PATCH 0/6] ConnMan 1.0 upgrade Ross Burton
2012-06-20 11:27 ` [PATCH 1/6] connman: rationalise configure options Ross Burton
2012-06-20 11:27 ` [PATCH 2/6] connman: add compat RPROVIDES for older packaging Ross Burton
2012-06-20 11:27 ` [PATCH 3/6] connman: upgrade to 1.0 Ross Burton
2012-06-20 11:27 ` [PATCH 4/6] connman-gnome: fix build depends (Yocto #2556) Ross Burton
2012-06-20 11:27 ` [PATCH 5/6] connman-gnome: clean up runtime dependencies Ross Burton
2012-06-20 11:27 ` [PATCH 6/6] connman-gnome: upgrade to 0.7, which works with connman 1.0 Ross Burton
2012-06-21 12:23 ` [PATCH 0/6] ConnMan 1.0 upgrade Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.