udisks: bump to version 1.0.5
PATCH v4 1/2 udisks: bump to version 1.0.5
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:
---
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(-)
package/udisks/Config.in +6 -0
@@ -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
package/udisks/udisks.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 udisks-1.0.4.tar.gz +sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz
package/udisks/udisks.mk +10 -1
@@ -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
Signature · 1 line
1.7.1
PATCH v4 2/2 udisks: fix build with newer glibc versions
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/
---
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
package/udisks/0001-fix-build-with-newer-glibc-versions.patch new file +29 -0
@@ -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 <[email protected]> + +From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <[email protected]> +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
Signature · 1 line
1.7.1
PATCH v4 2/2 udisks: fix build with newer glibc versions
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Vicente" == Vicente Olivert Riera <[email protected]> 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;
Quoted 5 lines
Fixes:
http://autobuild.buildroot.net/results/ab3/ab36c2a1d2ca41a4d9ec6bab7d8d45678dbc5dcd/
Signed-off-by Vicente Olivert Riera <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 1/2 udisks: bump to version 1.0.5
In reply to Vicente Olivert RieraQuoted 7 lines · 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 <[email protected]>
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
Quoted 65 lines
---
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 systemdpackage/udisks/Config.in | 6 ++++++ package/udisks/udisks.hash | 2 +- package/udisks/udisks.mk | 11 ++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-)package/udisks/Config.in +6
-0@@ -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 providespackage/udisks/udisks.hash +1
-1@@ -1,2 +1,2 @@ # Locally calculated -sha256 854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5 udisks-1.0.4.tar.gz +sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gzpackage/udisks/udisks.mk +10
-1@@ -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
Signature · 6 lines
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
PATCH v4 1/2 udisks: bump to version 1.0.5
Arnout,
Quoted 7 lines · Arnout Vandecappelle
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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v4 1/2 udisks: bump to version 1.0.5
Quoted 9 lines · Thomas Petazzoni
Arnout,
Quoted 5 lines · Arnout Vandecappelle
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).
Quoted 6 lines
Quoted 2 lines
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
Signature · 6 lines
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
PATCH v4 1/2 udisks: bump to version 1.0.5
In reply to Vicente Olivert RieraQuoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Vicente" == Vicente Olivert Riera <[email protected]> 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 <[email protected]>---
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.mkpackage/udisks/udisks.mk +1
-1@@ -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
package/udisks/udisks.mk UDISKS_DEPENDENCIES = \ · line 31
Quoted 10 lines
package/udisks/udisks.mk +7
-0@@ -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?
Signature · 1 line
Bye, Peter Korsgaard
PATCH v4 1/2 udisks: bump to version 1.0.5
Dear Peter Korsgaard,
Quoted 28 lines · Peter Korsgaard
Quoted 27 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Vicente" == Vicente Olivert Riera <[email protected]> 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 <[email protected]>---
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.mkpackage/udisks/udisks.mk +1
-1@@ -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
Quoted 10 lines
package/udisks/udisks.mk UDISKS_DEPENDENCIES = \ · line 31
Quoted 7 lines
package/udisks/udisks.mk +7
-0+# 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 += libgudevEhh, don't you mean
UDISKS_DEPENDENCIEShere?
Ooops!, yes, UDISKS_DEPENDENCIES of course.
Should I send another version or can you amend that?
Thanks,
Vincent.
PATCH v4 1/2 udisks: bump to version 1.0.5
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Vicente" == Vicente Olivert Riera <[email protected]> writes:
Hi,
Quoted 9 lines
Quoted 5 lines
package/udisks/udisks.mk UDISKS_DEPENDENCIES = \ · line 31
Quoted 2 lines
package/udisks/udisks.mk +2
-0+ifeq ($(BR2_PACKAGE_SYSTEMD),y) +UDISKS_CONF_OPTS += libgudevEhh, don't you mean
UDISKS_DEPENDENCIEShere?Ooops!, yes,
UDISKS_DEPENDENCIESof course.Should I send another version or can you amend that?
I'll amend it, thanks.
Signature · 2 lines
Venlig hilsen, Peter Korsgaard
PATCH v4 1/2 udisks: bump to version 1.0.5
In reply to Vicente Olivert RieraQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Vicente" == Vicente Olivert Riera <[email protected]> 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 <[email protected]>
Committed after changing the _CONF_OPTS to _DEPENDENCIES, thanks.
Signature · 1 line
Bye, Peter Korsgaard