[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Vicente Olivert Riera]

This version depends on libgudev when using systemd, otherwise it fails
with an error like this one:

checking for GUDEV... no
configure: error: Package requirements (gudev-1.0 >= 147) were not met:

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v3 -> v4: improve the libgudev dependency comment [Thomas]
Changes v2 -> v3: add a comment about the libgudev dependency
Changes v1 -> v2: depend on libgudev when using systemd

 package/udisks/Config.in   |    6 ++++++
 package/udisks/udisks.hash |    2 +-
 package/udisks/udisks.mk   |   11 ++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index a5da2bf..f24df03 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -12,6 +12,12 @@ config BR2_PACKAGE_UDISKS
 	select BR2_PACKAGE_PARTED
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_LIBATASMART
+	# When eudev is used as the udev provider, libgudev is automatically
+	# provided as it is part of eudev. However, when systemd is used as
+	# the udev provider, libgudev is not provided, and needs to be built
+	# separately. This is why we select the libgudev package only if
+	# systemd is used.
+	select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_SYSTEMD
 	help
 	  The udisks project provides
 
diff --git a/package/udisks/udisks.hash b/package/udisks/udisks.hash
index 5debfd5..7ad4326 100644
--- a/package/udisks/udisks.hash
+++ b/package/udisks/udisks.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5	udisks-1.0.4.tar.gz
+sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71  udisks-1.0.5.tar.gz
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index 7a24106..a39ff31 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UDISKS_VERSION = 1.0.4
+UDISKS_VERSION = 1.0.5
 UDISKS_SITE = http://hal.freedesktop.org/releases
 UDISKS_LICENSE = GPLv2+
 UDISKS_LICENSE_FILES = COPYING
@@ -22,6 +22,15 @@ UDISKS_DEPENDENCIES = 	\
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
 
+# When eudev is used as the udev provider, libgudev is automatically
+# provided as it is part of eudev. However, when systemd is used as the
+# udev provider, libgudev is not provided, and needs to be built
+# separately. This is why we select the libgudev package only if systemd
+# is used.
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+UDISKS_CONF_OPTS += libgudev
+endif
+
 ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
 UDISKS_CONF_OPTS += --enable-lvm2
 endif
-- 
1.7.1

[Buildroot] [PATCHv4 2/2] udisks: fix build with newer glibc versions

[Vicente Olivert Riera]

Backport an upstream patch to fix the build with newer glibc versions.
This is how the failure looks like:

job-drive-detach.c: In function 'sysfs_exists':
job-drive-detach.c:44:15: error: storage size of 'statbuf' isn't known
   struct stat statbuf;

Fixes:

  http://autobuild.buildroot.net/results/ab3/ab36c2a1d2ca41a4d9ec6bab7d8d45678dbc5dcd/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
Changes v3 -> v4: no changes
Changes v2 -> v3: no changes
Changes v1 -> v2: no changes

 .../0001-fix-build-with-newer-glibc-versions.patch |   29 ++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 package/udisks/0001-fix-build-with-newer-glibc-versions.patch

diff --git a/package/udisks/0001-fix-build-with-newer-glibc-versions.patch b/package/udisks/0001-fix-build-with-newer-glibc-versions.patch
new file mode 100644
index 0000000..336fc44
--- /dev/null
+++ b/package/udisks/0001-fix-build-with-newer-glibc-versions.patch
@@ -0,0 +1,29 @@
+Fix build with newer glibc versions
+
+This patch has been backported from upstream:
+
+http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 29 May 2015 21:09:39 -0400
+Subject: fix build with newer glibc versions
+
+https://bugs.freedesktop.org/show_bug.cgi?id=90778
+
+diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
+index eeafcab..d122a1f 100644
+--- a/src/helpers/job-drive-detach.c
++++ b/src/helpers/job-drive-detach.c
+@@ -18,6 +18,7 @@
+  *
+  */
+ 
++#include <sys/stat.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <errno.h>
+-- 
+cgit v0.10.2
-- 
1.7.1

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Arnout Vandecappelle]

On 02-09-15 16:21, Vicente Olivert Riera wrote:
> This version depends on libgudev when using systemd, otherwise it fails
> with an error like this one:
> 
> checking for GUDEV... no
> configure: error: Package requirements (gudev-1.0 >= 147) were not met:
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

 However, I think it would be better to take a different approach here, because
there will be more packages with this requirement (we already have libmbim now,
but there are probably more that we haven't detected yet because we don't have
systemd in the autobuilders).

 So I think there should be either a new virtual package or a suboption of udev
to handle the libgudev case.

 But that's more work, so let's fix udisks now by applying this patch.

 Regards,
 Arnout

> ---
> Changes v3 -> v4: improve the libgudev dependency comment [Thomas]
> Changes v2 -> v3: add a comment about the libgudev dependency
> Changes v1 -> v2: depend on libgudev when using systemd
> 
>  package/udisks/Config.in   |    6 ++++++
>  package/udisks/udisks.hash |    2 +-
>  package/udisks/udisks.mk   |   11 ++++++++++-
>  3 files changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/package/udisks/Config.in b/package/udisks/Config.in
> index a5da2bf..f24df03 100644
> --- a/package/udisks/Config.in
> +++ b/package/udisks/Config.in
> @@ -12,6 +12,12 @@ config BR2_PACKAGE_UDISKS
>  	select BR2_PACKAGE_PARTED
>  	select BR2_PACKAGE_LVM2
>  	select BR2_PACKAGE_LIBATASMART
> +	# When eudev is used as the udev provider, libgudev is automatically
> +	# provided as it is part of eudev. However, when systemd is used as
> +	# the udev provider, libgudev is not provided, and needs to be built
> +	# separately. This is why we select the libgudev package only if
> +	# systemd is used.
> +	select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_SYSTEMD
>  	help
>  	  The udisks project provides
>  
> diff --git a/package/udisks/udisks.hash b/package/udisks/udisks.hash
> index 5debfd5..7ad4326 100644
> --- a/package/udisks/udisks.hash
> +++ b/package/udisks/udisks.hash
> @@ -1,2 +1,2 @@
>  # Locally calculated
> -sha256	854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5	udisks-1.0.4.tar.gz
> +sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71  udisks-1.0.5.tar.gz
> diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
> index 7a24106..a39ff31 100644
> --- a/package/udisks/udisks.mk
> +++ b/package/udisks/udisks.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -UDISKS_VERSION = 1.0.4
> +UDISKS_VERSION = 1.0.5
>  UDISKS_SITE = http://hal.freedesktop.org/releases
>  UDISKS_LICENSE = GPLv2+
>  UDISKS_LICENSE_FILES = COPYING
> @@ -22,6 +22,15 @@ UDISKS_DEPENDENCIES = 	\
>  
>  UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
>  
> +# When eudev is used as the udev provider, libgudev is automatically
> +# provided as it is part of eudev. However, when systemd is used as the
> +# udev provider, libgudev is not provided, and needs to be built
> +# separately. This is why we select the libgudev package only if systemd
> +# is used.
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> +UDISKS_CONF_OPTS += libgudev
> +endif
> +
>  ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
>  UDISKS_CONF_OPTS += --enable-lvm2
>  endif
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Thomas Petazzoni]

Arnout,

On Wed, 2 Sep 2015 23:12:31 +0200, Arnout Vandecappelle wrote:

>  However, I think it would be better to take a different approach here, because
> there will be more packages with this requirement (we already have libmbim now,
> but there are probably more that we haven't detected yet because we don't have
> systemd in the autobuilders).
> 
>  So I think there should be either a new virtual package or a suboption of udev
> to handle the libgudev case.

The problem is you make a virtual package is that then you must use a
"depends on": you cannot "select" a virtual package, at least if you
use the normal virtual package mechanism and Config.in description.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Arnout Vandecappelle]

On 03-09-15 18:02, Thomas Petazzoni wrote:
> Arnout,
> 
> On Wed, 2 Sep 2015 23:12:31 +0200, Arnout Vandecappelle wrote:
> 
>>  However, I think it would be better to take a different approach here, because
>> there will be more packages with this requirement (we already have libmbim now,
>> but there are probably more that we haven't detected yet because we don't have
>> systemd in the autobuilders).
>>
>>  So I think there should be either a new virtual package or a suboption of udev
>> to handle the libgudev case.
> 
> The problem is you make a virtual package is that then you must use a
> "depends on": you cannot "select" a virtual package, at least if you
> use the normal virtual package mechanism and Config.in description.

 Right. So a suboption of udev then. Any package that needs libgudev also needs
udev, obviously. Something like:

udev/Config.in:
config BR2_PACKAGE_HAS_UDEV
	bool

if BR2_PACKAGE_HAS_UDEV
config BR2_PACKAGE_PROVIDES_UDEV
	string

config BR2_PACKAGE_NEEDS_GUDEV
	bool

config BR2_PACKAGE_PROVIDES_GUDEV
	string
endif


systemd/Config.in:
config BR2_PACKAGE_SYSTEMD
	# systemd provides udev but not libgudev
	select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_NEEDS_GUDEV


eudev/Config.in:
if BR2_PACKAGE_EUDEV
config BR2_PACKAGE_PROVIDES_GUDEV
	string
	default "eudev"
endif

(Actually, for eudev nothing is needed)


libgudev/Config.in:
if BR2_PACKAGE_LIBGUDEV
config BR2_PACKAGE_PROVIDES_GUDEV
	string
	default "libgudev"
endif


udisks/Config.in:
config BR2_PACKAGE_UDISKS
	select BR2_PACKAGE_NEEDS_GUDEV


udev/udev.mk:
ifeq ($(BR2_PACKAGE_NEEDS_GUDEV),y)
UDEV_DEPENDENCIES += $(call qstrip,$(BR2_PACKAGE_PROVIDES_GUDEV))
endif


udisks already depends on udev so libgudev will be implied if necessary


 Regards,
 Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Peter Korsgaard]

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > This version depends on libgudev when using systemd, otherwise it fails
 > with an error like this one:

 > checking for GUDEV... no
 > configure: error: Package requirements (gudev-1.0 >= 147) were not met:

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 > ---
 > Changes v3 -> v4: improve the libgudev dependency comment [Thomas]
 > Changes v2 -> v3: add a comment about the libgudev dependency
 > Changes v1 -> v2: depend on libgudev when using systemd

 > +++ b/package/udisks/udisks.mk
 > @@ -4,7 +4,7 @@
 >  #
 >  ################################################################################
 
 > -UDISKS_VERSION = 1.0.4
 > +UDISKS_VERSION = 1.0.5
 >  UDISKS_SITE = http://hal.freedesktop.org/releases
 >  UDISKS_LICENSE = GPLv2+
 >  UDISKS_LICENSE_FILES = COPYING
 > @@ -22,6 +22,15 @@ UDISKS_DEPENDENCIES = 	\
 
 >  UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
 
 > +# When eudev is used as the udev provider, libgudev is automatically
 > +# provided as it is part of eudev. However, when systemd is used as the
 > +# udev provider, libgudev is not provided, and needs to be built
 > +# separately. This is why we select the libgudev package only if systemd
 > +# is used.
 > +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 > +UDISKS_CONF_OPTS += libgudev

Ehh, don't you mean UDISKS_DEPENDENCIES here?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Vicente Olivert Riera]

Dear Peter Korsgaard,

On 09/05/2015 06:02 PM, Peter Korsgaard wrote:
>>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> 
>  > This version depends on libgudev when using systemd, otherwise it fails
>  > with an error like this one:
> 
>  > checking for GUDEV... no
>  > configure: error: Package requirements (gudev-1.0 >= 147) were not met:
> 
>  > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>  > ---
>  > Changes v3 -> v4: improve the libgudev dependency comment [Thomas]
>  > Changes v2 -> v3: add a comment about the libgudev dependency
>  > Changes v1 -> v2: depend on libgudev when using systemd
> 
>  > +++ b/package/udisks/udisks.mk
>  > @@ -4,7 +4,7 @@
>  >  #
>  >  ################################################################################
>  
>  > -UDISKS_VERSION = 1.0.4
>  > +UDISKS_VERSION = 1.0.5
>  >  UDISKS_SITE = http://hal.freedesktop.org/releases
>  >  UDISKS_LICENSE = GPLv2+
>  >  UDISKS_LICENSE_FILES = COPYING
>  > @@ -22,6 +22,15 @@ UDISKS_DEPENDENCIES = 	\
>  
>  >  UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
>  
>  > +# When eudev is used as the udev provider, libgudev is automatically
>  > +# provided as it is part of eudev. However, when systemd is used as the
>  > +# udev provider, libgudev is not provided, and needs to be built
>  > +# separately. This is why we select the libgudev package only if systemd
>  > +# is used.
>  > +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
>  > +UDISKS_CONF_OPTS += libgudev
> 
> Ehh, don't you mean UDISKS_DEPENDENCIES here?
> 

Ooops!, yes, UDISKS_DEPENDENCIES of course.

Should I send another version or can you amend that?

Thanks,

Vincent.

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Peter Korsgaard]

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

Hi,

>> > +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 >> > +UDISKS_CONF_OPTS += libgudev
 >> 
 >> Ehh, don't you mean UDISKS_DEPENDENCIES here?
 >> 

 > Ooops!, yes, UDISKS_DEPENDENCIES of course.

 > Should I send another version or can you amend that?

I'll amend it, thanks.

-- 
Venlig hilsen,
Peter Korsgaard 

[Buildroot] [PATCHv4 1/2] udisks: bump to version 1.0.5

[Peter Korsgaard]

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > This version depends on libgudev when using systemd, otherwise it fails
 > with an error like this one:

 > checking for GUDEV... no
 > configure: error: Package requirements (gudev-1.0 >= 147) were not met:

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Committed after changing the _CONF_OPTS to _DEPENDENCIES, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCHv4 2/2] udisks: fix build with newer glibc versions

[Peter Korsgaard]

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > Backport an upstream patch to fix the build with newer glibc versions.
 > This is how the failure looks like:

 > job-drive-detach.c: In function 'sysfs_exists':
 > job-drive-detach.c:44:15: error: storage size of 'statbuf' isn't known
 >    struct stat statbuf;

 > Fixes:

 >   http://autobuild.buildroot.net/results/ab3/ab36c2a1d2ca41a4d9ec6bab7d8d45678dbc5dcd/

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard