[OE-core] [oe-commits] Cristian Iorga : connman: upgrade to 1.12

[Martin Jansa]

On Thu, Mar 07, 2013 at 11:14:08AM +0000, git at git.openembedded.org wrote:
> Module: openembedded-core.git
> Branch: master
> Commit: bd94ab11bbb6501013ed27ecb22685664816986c
> URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bd94ab11bbb6501013ed27ecb22685664816986c
> 
> Author: Cristian Iorga <cristian.iorga at intel.com>
> Date:   Mon Mar  4 19:17:49 2013 +0200
> 
> connman: upgrade to 1.12
> 
> - 0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch no longer needed;
> fix included in package source code
> 
> Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> 
> ---
> 
>  meta/recipes-connectivity/connman/connman.inc      |    2 +-
>  ...If-there-is-no-d_type-support-use-fstatat.patch |   55 --------------------
>  .../connman/{connman_1.10.bb => connman_1.12.bb}   |    5 +-
>  3 files changed, 3 insertions(+), 59 deletions(-)
> 
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index db4d26c..04b21f7 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 = "r18"
> +INC_PR = "r0"

If this .inc file is reused by some other connman versions (e.g. .bb in
other layers) this will make PR going backwards for them.

It's OK to reset PR when changing PV, but please don't reset INC_PR too.

>  TIST = "--enable-tist"
>  TIST_powerpc = ""
> diff --git a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch b/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
> deleted file mode 100644
> index 7315545..0000000
> --- a/meta/recipes-connectivity/connman/connman/0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From 7007ef32a959ac4717c19339a24fd90a68638a19 Mon Sep 17 00:00:00 2001
> -From: Andrei Gherzan <andrei at gherzan.ro>
> -Date: Tue, 17 Jul 2012 16:07:17 +0300
> -Subject: [PATCH V3 2/2] storage.c: If there is no d_type support use
> - fstatat()
> -
> -This is useful for filesystems where d_type is always DT_UNKNOWN.
> -In this case use fstatat() function.
> -
> -Signed-off-by: Andrei Gherzan <andrei.gherzan at windriver.com>
> -Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
> -Upstream-Status: Submitted
> - 
> ----
> - src/storage.c |   19 +++++++++++++++++++
> - 1 file changed, 19 insertions(+)
> -
> -Index: git/src/storage.c
> -===================================================================
> ---- git.orig/src/storage.c
> -+++ git/src/storage.c
> -@@ -193,7 +193,6 @@ gchar **connman_storage_get_services()
> - 
> - 		switch (d->d_type) {
> - 		case DT_DIR:
> --		case DT_UNKNOWN:
> - 			/*
> - 			 * If the settings file is not found, then
> - 			 * assume this directory is not a services dir.
> -@@ -203,6 +202,25 @@ gchar **connman_storage_get_services()
> - 			ret = stat(str, &buf);
> - 			g_free(str);
> - 			if (ret < 0)
> -+				continue;
> -+
> -+			g_string_append_printf(result, "%s/", d->d_name);
> -+			break;
> -+		case DT_UNKNOWN:
> -+			/*
> -+			 * If there is no d_type support use fstatat()
> -+			 * to check if directory
> -+			 */
> -+			ret = fstatat(dirfd(dir), d->d_name, &buf, 0);
> -+			if (ret < 0)
> -+				continue;
> -+			if (!(buf.st_mode & S_IFDIR))
> -+				continue;
> -+			str = g_strdup_printf("%s/%s/settings", STORAGEDIR,
> -+							d->d_name);
> -+			ret = stat(str, &buf);
> -+			g_free(str);
> -+			if (ret < 0)
> - 				continue;
> - 
> - 			g_string_append_printf(result, "%s/", d->d_name);
> diff --git a/meta/recipes-connectivity/connman/connman_1.10.bb b/meta/recipes-connectivity/connman/connman_1.12.bb
> similarity index 74%
> rename from meta/recipes-connectivity/connman/connman_1.10.bb
> rename to meta/recipes-connectivity/connman/connman_1.12.bb
> index 7dca1b4..5ba4032 100644
> --- a/meta/recipes-connectivity/connman/connman_1.10.bb
> +++ b/meta/recipes-connectivity/connman/connman_1.12.bb
> @@ -1,12 +1,11 @@
>  require connman.inc
>  
> -# 1.10 tag
> -SRCREV = "3bda76eb442c9395db1dba17352c3e78376671cc"
> +# 1.12 tag
> +SRCREV = "8397cbbc0a79d39cf3b1880f4fd3f3405b6bc6ad"
>  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 \
> -            file://0002-storage.c-If-there-is-no-d_type-support-use-fstatat.patch \
>              file://inet-fix-ip-cleanup-functions.patch \
>              file://add-in.h-for-ipv6.patch"
>  S = "${WORKDIR}/git"
> 
> 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20130307/ce06e76f/attachment-0002.sig>