udisks: bump to version 1.0.5
PATCH v3 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 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(-)
package/udisks/Config.in +4 -0
@@ -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
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 +8 -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,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
Signature · 1 line
1.7.1
PATCH v3 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 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 v3 1/2 udisks: bump to version 1.0.5
In reply to Vicente Olivert RieraDear Vicente Olivert Riera,
package/udisks/Config.in config BR2_PACKAGE_UDISKS · line 17
Quoted 3 lines · Vicente Olivert Riera
package/udisks/Config.in +3
-0+ # 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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v3 1/2 udisks: bump to version 1.0.5
Dear Thomas Petazzoni,
Quoted 18 lines · Thomas Petazzoni
Dear Vicente Olivert Riera,
package/udisks/Config.in config BR2_PACKAGE_UDISKS · line 17
Quoted 3 lines · Vicente Olivert Riera
package/udisks/Config.in +3
-0+ # 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.
Quoted 4 lines
(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.
PATCH v3 1/2 udisks: bump to version 1.0.5
Dear Vicente Olivert Riera,
Quoted 14 lines · Vicente Olivert Riera
Quoted 14 lines
package/udisks/Config.in config BR2_PACKAGE_UDISKS · line 17
Quoted 3 lines
package/udisks/Config.in +3
-0+ # 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.
Quoted 7 lines
Quoted 4 lines
(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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com