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

[Buildroot] [PATCHv3 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 v2 -> v3: add a comment about the libgudev dependency
Changes v1 -> v2: depend on libgudev when using systemd

 package/udisks/Config.in   |    4 ++++
 package/udisks/udisks.hash |    2 +-
 package/udisks/udisks.mk   |    9 ++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index a5da2bf..9f5e2c0 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -12,6 +12,10 @@ config BR2_PACKAGE_UDISKS
 	select BR2_PACKAGE_PARTED
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_LIBATASMART
+	# udisks needs libgudev which is provided by eudev. But, if you are
+	# using systemd, since they removed libgudev from it, you need to
+	# install the libgudev package to satisfy this dependency.
+	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..ca4590a 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,13 @@ UDISKS_DEPENDENCIES = 	\
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
 
+# udisks needs libgudev which is provided by eudev. But, if you are
+# using systemd, since they removed libgudev from it, you need to
+# install the libgudev package to satisfy this dependency.
+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] [PATCHv3 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 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] [PATCHv3 1/2] udisks: bump to version 1.0.5

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Wed, 2 Sep 2015 11:50:44 +0100, Vicente Olivert Riera wrote:

> +	# udisks needs libgudev which is provided by eudev. But, if you are
> +	# using systemd, since they removed libgudev from it, you need to
> +	# install the libgudev package to satisfy this dependency.

I think the wording is not quite good yet. The sentence "udisks needs
libgudev which is provided by eudev" is wrong, because libgudev can
also be provided by libgudev. What about instead:

	# 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.

(Or something along those lines, my english is not perfect, for sure).

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

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

[Vicente Olivert Riera]

Dear Thomas Petazzoni,

On 09/02/2015 03:09 PM, Thomas Petazzoni wrote:
> Dear Vicente Olivert Riera,
> 
> On Wed, 2 Sep 2015 11:50:44 +0100, Vicente Olivert Riera wrote:
> 
>> +	# udisks needs libgudev which is provided by eudev. But, if you are
>> +	# using systemd, since they removed libgudev from it, you need to
>> +	# install the libgudev package to satisfy this dependency.
> 
> I think the wording is not quite good yet. The sentence "udisks needs
> libgudev which is provided by eudev" is wrong, because libgudev can
> also be provided by libgudev. What about instead:
> 
> 	# 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.
> 
> (Or something along those lines, my english is not perfect, for sure).
> 
> Thomas
> 

your explanation looks better to me. Care to use --amend before pushing
the changes, please? :-P Or do you want me to send a v4 for this?

Regards,

Vincent.

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

[Thomas Petazzoni]

Dear Vicente Olivert Riera,

On Wed, 2 Sep 2015 15:12:33 +0100, Vicente Olivert Riera wrote:

> >> +	# udisks needs libgudev which is provided by eudev. But, if you are
> >> +	# using systemd, since they removed libgudev from it, you need to
> >> +	# install the libgudev package to satisfy this dependency.
> > 
> > I think the wording is not quite good yet. The sentence "udisks needs
> > libgudev which is provided by eudev" is wrong, because libgudev can
> > also be provided by libgudev. What about instead:
> > 
> > 	# 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.
> > 
> > (Or something along those lines, my english is not perfect, for sure).
> > 
> > Thomas
> > 
> 
> your explanation looks better to me. Care to use --amend before pushing
> the changes, please? :-P Or do you want me to send a v4 for this?

I may not be the one applying the changes: Peter is back online and
available to merge things, so he might be the one merging the patches.
So please send a v4.

Thanks,

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

[Buildroot] [PATCHv3 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 v2 -> v3: add a comment explaining the libgudev dependency
Changes v1 -> v2: depend on libgudev when using systemd

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

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index a5da2bf..fba1793 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_UDISKS
 	select BR2_PACKAGE_PARTED
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_LIBATASMART
+	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..957823c 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,10 @@ UDISKS_DEPENDENCIES = 	\
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
 
+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] [PATCHv3 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 v2 -> v3: add a comment to explain the libgudev dependency 
Changes v1 -> v2: depend on libgudev when using systemd

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

diff --git a/package/udisks/Config.in b/package/udisks/Config.in
index a5da2bf..fba1793 100644
--- a/package/udisks/Config.in
+++ b/package/udisks/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_UDISKS
 	select BR2_PACKAGE_PARTED
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_LIBATASMART
+	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..957823c 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,10 @@ UDISKS_DEPENDENCIES = 	\
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
 
+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