Skip to contentSkip to conversation

udisks: bump to version 1.0.5

PATCH Superseded Vicente Olivert Riera 1 participant 2 messages Sep 2, 2015

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

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 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(-)
package/udisks/Config.in +1 -0
index a5da2bf..fba1793 100644
@@ -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
 
package/udisks/udisks.hash +1 -1
index 5debfd5..7ad4326 100644
@@ -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 +5 -1
index 7a24106..957823c 100644
@@ -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
Signature · 1 line
1.7.1
#1 lore raw

PATCH 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
new file mode 100644
index 0000000..336fc44
@@ -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