Patchwork connman: fix build with automake 1.12

login
register
mail settings
Submitter Ross Burton
Date July 11, 2012, 3:39 p.m.
Message ID <1342021183-30173-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/31771/
State Accepted
Commit 292469a70282ed83a8c73b3a5c57d7327ebde793
Headers show

Comments

Ross Burton - July 11, 2012, 3:39 p.m.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/connman/connman.inc |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Colin Walters - July 11, 2012, 10 p.m.
On Wed, 2012-07-11 at 16:39 +0100, Ross Burton wrote:

> +	# Automake 1.12 won't install empty directories, but we need the
> +	# plugins directory to be present for ownership
> +	mkdir -p ${D}${libdir}/connman/plugins
>  }

Did you consider patching upstream to do this in install-data-local
rule?  That way everyone gets the fix (Debian/Gentoo/Fedora etc.), not
just you.
Ross Burton - July 12, 2012, 9:17 p.m.
On 11 July 2012 23:00, Colin Walters <walters@verbum.org> wrote:
> On Wed, 2012-07-11 at 16:39 +0100, Ross Burton wrote:
>
>> +     # Automake 1.12 won't install empty directories, but we need the
>> +     # plugins directory to be present for ownership
>> +     mkdir -p ${D}${libdir}/connman/plugins
>>  }
>
> Did you consider patching upstream to do this in install-data-local
> rule?  That way everyone gets the fix (Debian/Gentoo/Fedora etc.), not
> just you.

Yes, and I also considered that this surely can't be restricted to
connman and automake should have some clean way of forcing an empty
directory to exist.  I'm also pretty certain the automake maintainers
response would be "do it in install-data-local", so this should go to
connman...

Ross
Saul Wold - July 18, 2012, 12:35 a.m.
On 07/11/2012 08:39 AM, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   meta/recipes-connectivity/connman/connman.inc |    6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
> index 12378e9..bb6f532 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 = "r11"
> +INC_PR = "r12"
>
>   TIST = "--enable-tist"
>   TIST_powerpc = ""
> @@ -72,6 +72,10 @@ do_install_append() {
>
>   	# We don't need to package an empty directory
>   	rmdir ${D}${libdir}/connman/scripts
> +
> +	# Automake 1.12 won't install empty directories, but we need the
> +	# plugins directory to be present for ownership
> +	mkdir -p ${D}${libdir}/connman/plugins
>   }
>
>   # These used to be plugins, but now they are core
>


Merged this change into OE-Core, other connman changes are pending with 
some clean up requests.

Thanks
	Sau!

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 12378e9..bb6f532 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 = "r11"
+INC_PR = "r12"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""
@@ -72,6 +72,10 @@  do_install_append() {
 
 	# We don't need to package an empty directory
 	rmdir ${D}${libdir}/connman/scripts
+
+	# Automake 1.12 won't install empty directories, but we need the
+	# plugins directory to be present for ownership
+	mkdir -p ${D}${libdir}/connman/plugins
 }
 
 # These used to be plugins, but now they are core