summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-22 19:17:07 +0300
committerKhem Raj <raj.khem@gmail.com>2019-07-22 14:16:51 -0700
commit8ea8557760c2a881761ea5108d48ea146bb3533b (patch)
tree2cd9b116fc0302759df6fbb4fb0ab68f5e5591a5 /meta-oe
parente6d53c86d041bb59fd7a90340c54b2a9b7f1d713 (diff)
downloadmeta-openembedded-8ea8557760c2a881761ea5108d48ea146bb3533b.tar.gz
udisks: Remove this obsolete version
All users already switced to udisks2. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch89
-rw-r--r--meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch27
-rw-r--r--meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch77
-rw-r--r--meta-oe/recipes-support/udisks/udisks/0001-tools-Install-bash_completion-script-in-etc-bash_com.patch33
-rw-r--r--meta-oe/recipes-support/udisks/udisks/0001-udisks-helper-Use-sh-interpreter-instead-of-bash.patch38
-rw-r--r--meta-oe/recipes-support/udisks/udisks/optional-depends.patch498
-rw-r--r--meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch32
-rw-r--r--meta-oe/recipes-support/udisks/udisks_1.0.5.bb51
9 files changed, 1 insertions, 846 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 7bc0f1943..f7eafe2e3 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
@@ -251,7 +251,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\
251 libcanberra \ 251 libcanberra \
252 ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xorgxrdp xrdp", "", d)} \ 252 ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xorgxrdp xrdp", "", d)} \
253 procmail \ 253 procmail \
254 ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks udisks2 upower", "", d)} \ 254 ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "udisks2 upower", "", d)} \
255 ${NE10} \ 255 ${NE10} \
256 " 256 "
257 257
diff --git a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch b/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch
deleted file mode 100644
index 2823c54f1..000000000
--- a/meta-oe/recipes-support/udisks/udisks/0001-Make-udev-rules-directory-configurable.patch
+++ /dev/null
@@ -1,89 +0,0 @@
1From a6eab413f274376cf703a608e2866118291a6185 Mon Sep 17 00:00:00 2001
2From: Amarnath Valluri <amarnath.valluri@intel.com>
3Date: Thu, 9 Feb 2017 11:02:53 +0200
4Subject: [PATCH] Make udev rules directory configurable.
5
6udev rules directory can be configurable via undevrulesdir variable. And use
7libdir, sbindir for installing librares and binaries.
8
9Upstream-Status: Inappropriate[Embedded specific]
10
11Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
12
13---
14 configure.ac | 14 +++-----------
15 data/Makefile.am | 1 -
16 src/probers/Makefile.am | 2 +-
17 tools/Makefile.am | 2 +-
18 4 files changed, 5 insertions(+), 14 deletions(-)
19
20diff --git a/configure.ac b/configure.ac
21index 8c4e4c2..a143397 100644
22--- a/configure.ac
23+++ b/configure.ac
24@@ -227,15 +227,8 @@ if test "x$GCC" = "xyes"; then
25 LDFLAGS="-Wl,--as-needed $LDFLAGS"
26 fi
27
28-if test "$prefix" = "/usr" -o "$prefix" = "/usr/local" ; then
29- slashlibdir=/lib
30- slashsbindir=/sbin
31-else
32- slashlibdir=$prefix/lib
33- slashsbindir=$prefix/sbin
34-fi
35-AC_SUBST(slashlibdir)
36-AC_SUBST(slashsbindir)
37+udevrulesdir=/lib/udev/udev.d
38+AC_SUBST(udevrulesdir)
39
40 # *************
41 # Remote Access
42@@ -299,8 +292,7 @@ echo "
43 sysconfdir: ${sysconfdir}
44 localstatedir: ${localstatedir}
45 docdir: ${docdir}
46- slashlibdir: ${slashlibdir}
47- slashsbindir: ${slashsbindir}
48+ udevrulesdir: ${udevrulesdir}
49 systemdsystemunitdir: ${systemdsystemunitdir}
50
51 compiler: ${CC}
52diff --git a/data/Makefile.am b/data/Makefile.am
53index 08af5f4..9329186 100644
54--- a/data/Makefile.am
55+++ b/data/Makefile.am
56@@ -34,7 +34,6 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile
57 @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
58 endif
59
60-udevrulesdir = $(slashlibdir)/udev/rules.d
61 udevrules_DATA = 80-udisks.rules
62
63 pkgconfigdir = $(datadir)/pkgconfig
64diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am
65index 01c693b..6a0361a 100644
66--- a/src/probers/Makefile.am
67+++ b/src/probers/Makefile.am
68@@ -20,7 +20,7 @@ INCLUDES = \
69 # TODO: ideally move most of this to udev and/or util-linux
70 #
71
72-udevhelperdir = $(slashlibdir)/udev
73+udevhelperdir = $(libdir)/udev
74 udevhelper_PROGRAMS = udisks-part-id \
75 udisks-probe-sas-expander \
76 $(NULL)
77diff --git a/tools/Makefile.am b/tools/Makefile.am
78index 18325f7..0aaec11 100644
79--- a/tools/Makefile.am
80+++ b/tools/Makefile.am
81@@ -54,7 +54,7 @@ udisks_LDADD = \
82 $(DBUS_GLIB_LIBS) \
83 $(POLKIT_DBUS_LIBS)
84
85-slashsbin_PROGRAMS = umount.udisks
86+sbin_PROGRAMS = umount.udisks
87
88 umount_udisks_SOURCES = umount-udisks.c
89 umount_udisks_LDADD = $(DBUS_GLIB_LIBS) $(POLKIT_DBUS_LIBS)
diff --git a/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch b/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch
deleted file mode 100644
index 8b4f44124..000000000
--- a/meta-oe/recipes-support/udisks/udisks/0001-fix-build-with-newer-glibc-versions.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 054ad6a06cfac7c3d172d53cd901204079a53ec3 Mon Sep 17 00:00:00 2001
2From: Alexandre Rostovtsev <tetromino@gentoo.org>
3Date: Fri, 29 May 2015 21:09:39 -0400
4Subject: [PATCH] fix build with newer glibc versions
5
6https://bugs.freedesktop.org/show_bug.cgi?id=90778
7
8Upstream-Status: Applied [1]
9
10[1] http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0
11
12---
13 src/helpers/job-drive-detach.c | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c
17index eeafcab..d122a1f 100644
18--- a/src/helpers/job-drive-detach.c
19+++ b/src/helpers/job-drive-detach.c
20@@ -18,6 +18,7 @@
21 *
22 */
23
24+#include <sys/stat.h>
25 #include <stdio.h>
26 #include <string.h>
27 #include <errno.h>
diff --git a/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch
deleted file mode 100644
index f140793c5..000000000
--- a/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From 64f051963d6cdeebd19f9e7f0a7e584a1f7acc60 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 11 Aug 2018 19:12:57 -0700
4Subject: [PATCH] include sys/sysmacros.h
5
6fixes build with glibc 2.28+
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/daemon.c | 1 +
12 src/device.c | 1 +
13 src/mount-monitor.c | 1 +
14 tools/udisks.c | 1 +
15 tools/umount-udisks.c | 1 +
16 5 files changed, 5 insertions(+)
17
18diff --git a/src/daemon.c b/src/daemon.c
19index 14e952f..2c61cfb 100644
20--- a/src/daemon.c
21+++ b/src/daemon.c
22@@ -39,6 +39,7 @@
23 #include <errno.h>
24 #include <string.h>
25 #include <sys/types.h>
26+#include <sys/sysmacros.h>
27 #include <sys/stat.h>
28 #include <sys/time.h>
29 #include <sys/resource.h>
30diff --git a/src/device.c b/src/device.c
31index d73f9d6..5911d78 100644
32--- a/src/device.c
33+++ b/src/device.c
34@@ -29,6 +29,7 @@
35 #include <errno.h>
36 #include <string.h>
37 #include <sys/types.h>
38+#include <sys/sysmacros.h>
39 #include <sys/wait.h>
40 #include <sys/stat.h>
41 #include <sys/time.h>
42diff --git a/src/mount-monitor.c b/src/mount-monitor.c
43index 573a69c..ccf3365 100644
44--- a/src/mount-monitor.c
45+++ b/src/mount-monitor.c
46@@ -28,6 +28,7 @@
47 #include <errno.h>
48 #include <string.h>
49 #include <sys/types.h>
50+#include <sys/sysmacros.h>
51 #include <sys/stat.h>
52 #include <mntent.h>
53
54diff --git a/tools/udisks.c b/tools/udisks.c
55index d30159b..f24a30a 100644
56--- a/tools/udisks.c
57+++ b/tools/udisks.c
58@@ -29,6 +29,7 @@
59 #include <errno.h>
60 #include <string.h>
61 #include <sys/types.h>
62+#include <sys/sysmacros.h>
63 #include <sys/stat.h>
64 #include <sys/wait.h>
65 #include <fcntl.h>
66diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
67index 2813fe0..5cf6b4d 100644
68--- a/tools/umount-udisks.c
69+++ b/tools/umount-udisks.c
70@@ -29,6 +29,7 @@
71 #include <errno.h>
72 #include <string.h>
73 #include <sys/types.h>
74+#include <sys/sysmacros.h>
75 #include <sys/stat.h>
76 #include <fcntl.h>
77 #include <pwd.h>
diff --git a/meta-oe/recipes-support/udisks/udisks/0001-tools-Install-bash_completion-script-in-etc-bash_com.patch b/meta-oe/recipes-support/udisks/udisks/0001-tools-Install-bash_completion-script-in-etc-bash_com.patch
deleted file mode 100644
index 16dc44067..000000000
--- a/meta-oe/recipes-support/udisks/udisks/0001-tools-Install-bash_completion-script-in-etc-bash_com.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 7863a72c723035529d6fd8d626d7fbf9a765f162 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 May 2019 21:49:57 -0700
4Subject: [PATCH] tools: Install bash_completion script in
5 /etc/bash_completion.d
6
7In OE this is one of common locations to install bash_completion files
8and its covered for packaging automatically when bash_completion class
9is inherited
10
11Upstream-Status: Inappropriate [OE-Specific]
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 tools/Makefile.am | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/tools/Makefile.am b/tools/Makefile.am
19index 0aaec11..839c961 100644
20--- a/tools/Makefile.am
21+++ b/tools/Makefile.am
22@@ -72,7 +72,7 @@ udisks_tcp_bridge_LDADD = $(DBUS_GLIB_LIBS)
23
24 CLEANFILES = $(BUILT_SOURCES)
25
26-profiledir = $(sysconfdir)/profile.d
27+profiledir = $(sysconfdir)/bash_completion.d
28 profile_SCRIPTS = udisks-bash-completion.sh
29
30 EXTRA_DIST = $(profile_SCRIPTS)
31--
322.21.0
33
diff --git a/meta-oe/recipes-support/udisks/udisks/0001-udisks-helper-Use-sh-interpreter-instead-of-bash.patch b/meta-oe/recipes-support/udisks/udisks/0001-udisks-helper-Use-sh-interpreter-instead-of-bash.patch
deleted file mode 100644
index ef7f6f9c3..000000000
--- a/meta-oe/recipes-support/udisks/udisks/0001-udisks-helper-Use-sh-interpreter-instead-of-bash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 44953e5501e92c87611be45221338004e8032a74 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 23 May 2019 22:00:14 -0700
4Subject: [PATCH] udisks-helper: Use sh interpreter instead of bash
5
6These scripts do not require bash, since they do not use any bash
7specific extentions
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/helpers/udisks-helper-change-luks-password | 2 +-
13 src/helpers/udisks-helper-mdadm-expand | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/helpers/udisks-helper-change-luks-password b/src/helpers/udisks-helper-change-luks-password
17index edcf6c9..c71fc72 100755
18--- a/src/helpers/udisks-helper-change-luks-password
19+++ b/src/helpers/udisks-helper-change-luks-password
20@@ -1,4 +1,4 @@
21-#!/bin/bash
22+#!/usr/bin/env sh
23 set -e
24
25 DEVICE=$1
26diff --git a/src/helpers/udisks-helper-mdadm-expand b/src/helpers/udisks-helper-mdadm-expand
27index 8b4e23d..921f96a 100755
28--- a/src/helpers/udisks-helper-mdadm-expand
29+++ b/src/helpers/udisks-helper-mdadm-expand
30@@ -1,4 +1,4 @@
31-#!/bin/bash
32+#!/usr/bin/env sh
33
34 set -e
35
36--
372.21.0
38
diff --git a/meta-oe/recipes-support/udisks/udisks/optional-depends.patch b/meta-oe/recipes-support/udisks/udisks/optional-depends.patch
deleted file mode 100644
index a890954fc..000000000
--- a/meta-oe/recipes-support/udisks/udisks/optional-depends.patch
+++ /dev/null
@@ -1,498 +0,0 @@
1From e8b3fbfa3d6a11eee25db2dc0f31f439aaf0b65a Mon Sep 17 00:00:00 2001
2From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
3Date: Thu, 26 May 2011 17:30:04 -0300
4Subject: [PATCH] Allow disabling atasmart, lvm2 and devicemapper support.
5
6https://bugs.freedesktop.org/show_bug.cgi?id=37647
7
8---
9 configure.ac | 53 +++++++++++++++++++++++++++++++++++++++----------
10 src/adapter-private.h | 1 -
11 src/adapter.c | 1 -
12 src/daemon.c | 4 ++++
13 src/device-private.c | 2 +-
14 src/device-private.h | 5 ++---
15 src/device.c | 23 +++++++++++++++++----
16 src/expander-private.h | 1 -
17 src/expander.c | 1 -
18 src/helpers/Makefile.am | 20 +++++++++++++------
19 src/helpers/partutil.c | 3 ++-
20 src/port-private.h | 1 -
21 src/probers/Makefile.am | 8 ++++++--
22 tools/udisks.c | 10 ++++++++--
23 14 files changed, 99 insertions(+), 34 deletions(-)
24
25diff --git a/configure.ac b/configure.ac
26index 9454423..8c4e4c2 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -155,13 +155,33 @@ PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.97])
30 AC_SUBST(POLKIT_GOBJECT_1_CFLAGS)
31 AC_SUBST(POLKIT_GOBJECT_1_LIBS)
32
33-PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
34-AC_SUBST(LIBPARTED_CFLAGS)
35-AC_SUBST(LIBPARTED_LIBS)
36-
37-PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
38-AC_SUBST(DEVMAPPER_CFLAGS)
39-AC_SUBST(DEVMAPPER_LIBS)
40+have_parted=no
41+AC_ARG_ENABLE(parted, AS_HELP_STRING([--disable-parted], [disable disk partitioning]))
42+if test "x$enable_parted" != "xno"; then
43+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8],
44+ [AC_DEFINE(USE_PARTED, 1, [Define if parted should be used]) have_parted=yes],
45+ have_parted=no)
46+ AC_SUBST(LIBPARTED_CFLAGS)
47+ AC_SUBST(LIBPARTED_LIBS)
48+ if test "x$have_parted" = xno -a "x$enable_parted" = xyes; then
49+ AC_MSG_ERROR([parted support requested but libraries not found])
50+ fi
51+fi
52+AM_CONDITIONAL(HAVE_PARTED, [test "$have_parted" = "yes"])
53+
54+have_devmapper=no
55+AC_ARG_ENABLE(devmapper, AS_HELP_STRING([--disable-devmapper], [disable device mapper support]))
56+if test "x$enable_devmapper" != "xno"; then
57+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02],
58+ [AC_DEFINE(HAVE_DEVMAPPER, 1, [Define if device mapper is available]) have_devmapper=yes],
59+ have_devmapper=no)
60+ AC_SUBST(DEVMAPPER_CFLAGS)
61+ AC_SUBST(DEVMAPPER_LIBS)
62+ if test "x$have_devmapper" = xno -a "x$enable_devmapper" = xyes; then
63+ AC_MSG_ERROR([devmapper support requested but libraries not found])
64+ fi
65+fi
66+AM_CONDITIONAL(HAVE_DEVMAPPER, [test "$have_devmapper" = "yes"])
67
68 have_lvm2=no
69 AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--enable-lvm2], [enable LVM2 support]))
70@@ -185,9 +205,19 @@ if test "x$enable_dmmp" = "xyes"; then
71 fi
72 AM_CONDITIONAL(HAVE_DMMP, [test "$have_dmmp" = "yes"])
73
74-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
75-AC_SUBST(LIBATASMART_CFLAGS)
76-AC_SUBST(LIBATASMART_LIBS)
77+have_libatasmart=no
78+AC_ARG_ENABLE(libatasmart, AS_HELP_STRING([--disable-libatasmart], [disable libatasmart support]))
79+if test "x$enable_libatasmart" != "xno"; then
80+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14],
81+ [AC_DEFINE(HAVE_LIBATASMART, 1, [Define if libatasmart is available]) have_libatasmart=yes],
82+ have_libatasmart=no)
83+ AC_SUBST(LIBATASMART_CFLAGS)
84+ AC_SUBST(LIBATASMART_LIBS)
85+ if test "x$have_libatasmart" = xno -a "x$enable_libatasmart" = xyes; then
86+ AC_MSG_ERROR([libatasmart support requested but libraries not found])
87+ fi
88+fi
89+AM_CONDITIONAL(HAVE_LIBATASMART, [test "$have_libatasmart" = "yes"])
90
91 PKG_CHECK_MODULES(LIBUDEV, [libudev >= 143])
92 AC_SUBST(LIBUDEV_CFLAGS)
93@@ -278,9 +308,12 @@ echo "
94 cppflags: ${CPPFLAGS}
95 xsltproc: ${XSLTPROC}
96
97+ Parted support: ${have_parted}
98+ Device Mapper support: ${have_devmapper}
99 LVM2 support: ${have_lvm2}
100 dm-multipath: ${have_dmmp}
101 Remote Access: ${remote_access}
102+ libatasmart support: ${have_libatasmart}
103
104 Maintainer mode: ${USE_MAINTAINER_MODE}
105 Profiling: ${enable_profiling}
106diff --git a/src/adapter-private.h b/src/adapter-private.h
107index 3409e21..ef584e3 100644
108--- a/src/adapter-private.h
109+++ b/src/adapter-private.h
110@@ -23,7 +23,6 @@
111
112 #include <dbus/dbus-glib.h>
113 #include <gudev/gudev.h>
114-#include <atasmart.h>
115
116 #include "types.h"
117
118diff --git a/src/adapter.c b/src/adapter.c
119index 65e05b0..45db8c8 100644
120--- a/src/adapter.c
121+++ b/src/adapter.c
122@@ -30,7 +30,6 @@
123 #include <dbus/dbus-glib.h>
124 #include <dbus/dbus-glib-lowlevel.h>
125 #include <gudev/gudev.h>
126-#include <atasmart.h>
127
128 #include "daemon.h"
129 #include "adapter.h"
130diff --git a/src/daemon.c b/src/daemon.c
131index fafcf9a..14e952f 100644
132--- a/src/daemon.c
133+++ b/src/daemon.c
134@@ -1748,6 +1748,7 @@ mdstat_changed_event (GIOChannel *channel,
135 return TRUE;
136 }
137
138+#ifdef HAVE_LIBATASMART
139 static gboolean
140 refresh_ata_smart_data (Daemon *daemon)
141 {
142@@ -1776,6 +1777,7 @@ refresh_ata_smart_data (Daemon *daemon)
143
144 return FALSE;
145 }
146+#endif
147
148 static gboolean
149 register_disks_daemon (Daemon *daemon)
150@@ -1987,12 +1989,14 @@ daemon_new (void)
151 mount_file_clean_stale (l);
152 g_list_free (l);
153
154+#ifdef HAVE_LIBATASMART
155 /* set up timer for refreshing ATA SMART data - we don't want to refresh immediately because
156 * when adding a device we also do this...
157 */
158 daemon->priv->ata_smart_refresh_timer_id = g_timeout_add_seconds (ATA_SMART_REFRESH_INTERVAL_SECONDS,
159 (GSourceFunc) refresh_ata_smart_data,
160 daemon);
161+#endif
162
163 PROFILE ("daemon_new(): end");
164 return daemon;
165diff --git a/src/device-private.c b/src/device-private.c
166index 45418ce..fb1d959 100644
167--- a/src/device-private.c
168+++ b/src/device-private.c
169@@ -1390,7 +1390,7 @@ device_set_drive_ata_smart_time_collected (Device *device,
170
171 void
172 device_set_drive_ata_smart_status (Device *device,
173- SkSmartOverall value)
174+ guint value)
175 {
176 if (G_UNLIKELY (device->priv->drive_ata_smart_status != value))
177 {
178diff --git a/src/device-private.h b/src/device-private.h
179index 32a9bd0..8c57c13 100644
180--- a/src/device-private.h
181+++ b/src/device-private.h
182@@ -23,7 +23,6 @@
183
184 #include <dbus/dbus-glib.h>
185 #include <gudev/gudev.h>
186-#include <atasmart.h>
187
188 #include "types.h"
189
190@@ -228,7 +227,7 @@ struct DevicePrivate
191
192 gboolean drive_ata_smart_is_available;
193 guint64 drive_ata_smart_time_collected;
194- SkSmartOverall drive_ata_smart_status;
195+ guint drive_ata_smart_status;
196 void *drive_ata_smart_blob;
197 gsize drive_ata_smart_blob_size;
198
199@@ -396,7 +395,7 @@ void device_set_holders_objpath (Device *device, GStrv value);
200
201 void device_set_drive_ata_smart_is_available (Device *device, gboolean value);
202 void device_set_drive_ata_smart_time_collected (Device *device, guint64 value);
203-void device_set_drive_ata_smart_status (Device *device, SkSmartOverall value);
204+void device_set_drive_ata_smart_status (Device *device, guint value);
205 void device_set_drive_ata_smart_blob_steal (Device *device, gchar *blob, gsize blob_size);
206
207 G_END_DECLS
208diff --git a/src/device.c b/src/device.c
209index 2ae7f38..d73f9d6 100644
210--- a/src/device.c
211+++ b/src/device.c
212@@ -50,7 +50,9 @@
213 #include <dbus/dbus-glib.h>
214 #include <dbus/dbus-glib-lowlevel.h>
215 #include <gudev/gudev.h>
216+#ifdef HAVE_LIBATASMART
217 #include <atasmart.h>
218+#endif
219
220 #include "daemon.h"
221 #include "device.h"
222@@ -664,10 +666,14 @@ get_property (GObject *object,
223 case PROP_DRIVE_ATA_SMART_STATUS:
224 {
225 const gchar *status;
226- if (device->priv->drive_ata_smart_status == (SkSmartOverall) - 1)
227+#ifdef HAVE_LIBATASMART
228+ if (device->priv->drive_ata_smart_status == (guint) - 1)
229 status = "";
230 else
231 status = sk_smart_overall_to_string (device->priv->drive_ata_smart_status);
232+#else
233+ status = "";
234+#endif
235 g_value_set_string (value, status);
236 }
237 break;
238@@ -5144,6 +5150,7 @@ device_new (Daemon *daemon,
239 goto out;
240 }
241
242+#ifdef HAVE_LIBATASMART
243 /* if just added, update the smart data if applicable */
244 if (device->priv->drive_ata_smart_is_available)
245 {
246@@ -5151,6 +5158,7 @@ device_new (Daemon *daemon,
247 gchar *ata_smart_refresh_data_options[] = { NULL };
248 device_drive_ata_smart_refresh_data (device, ata_smart_refresh_data_options, NULL);
249 }
250+#endif
251
252 PROFILE ("device_new(native_path=%s): end", native_path);
253 out:
254@@ -9840,16 +9848,18 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context,
255 const char *stdout,
256 gpointer user_data)
257 {
258+#ifdef HAVE_LIBATASMART
259 gint rc;
260- SkDisk *d;
261+ SkDisk *d = NULL;
262+ SkSmartOverall overall;
263 gchar *blob;
264 gsize blob_size;
265 time_t time_collected;
266- SkSmartOverall overall;
267+#endif
268
269 PROFILE ("drive_ata_smart_refresh_data_completed_cb(device=%s) start", device->priv->native_path);
270
271- d = NULL;
272+#ifdef HAVE_LIBATASMART
273 blob = NULL;
274
275 if (job_was_cancelled || stdout == NULL)
276@@ -9953,6 +9963,11 @@ drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context,
277 g_free (blob);
278 if (d != NULL)
279 sk_disk_free (d);
280+
281+#else
282+ throw_error (context, ERROR_FAILED, "libatasmart support disabled");
283+#endif
284+
285 PROFILE ("drive_ata_smart_refresh_data_completed_cb(device=%s) end", device->priv->native_path);
286 }
287
288diff --git a/src/expander-private.h b/src/expander-private.h
289index ef4f440..98a8300 100644
290--- a/src/expander-private.h
291+++ b/src/expander-private.h
292@@ -23,7 +23,6 @@
293
294 #include <dbus/dbus-glib.h>
295 #include <gudev/gudev.h>
296-#include <atasmart.h>
297
298 #include "types.h"
299
300diff --git a/src/expander.c b/src/expander.c
301index 734ec0a..e799f13 100644
302--- a/src/expander.c
303+++ b/src/expander.c
304@@ -34,7 +34,6 @@
305 #include <dbus/dbus-glib.h>
306 #include <dbus/dbus-glib-lowlevel.h>
307 #include <gudev/gudev.h>
308-#include <atasmart.h>
309 #include <stdlib.h>
310
311 #include "daemon.h"
312diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
313index 4b863c0..d3ec4e9 100644
314--- a/src/helpers/Makefile.am
315+++ b/src/helpers/Makefile.am
316@@ -19,15 +19,9 @@ INCLUDES = \
317
318 libexec_PROGRAMS = \
319 udisks-helper-mkfs \
320- udisks-helper-delete-partition \
321- udisks-helper-create-partition \
322- udisks-helper-modify-partition \
323- udisks-helper-create-partition-table \
324 udisks-helper-change-filesystem-label \
325 udisks-helper-linux-md-remove-component \
326 udisks-helper-fstab-mounter \
327- udisks-helper-ata-smart-collect \
328- udisks-helper-ata-smart-selftest \
329 udisks-helper-drive-detach \
330 udisks-helper-drive-poll \
331 udisks-helper-linux-md-check \
332@@ -48,6 +42,13 @@ udisks_helper_mkfs_SOURCES = job-shared.h job-mkfs.c
333 udisks_helper_mkfs_CPPFLAGS = $(AM_CPPFLAGS)
334 udisks_helper_mkfs_LDADD = $(GLIB_LIBS)
335
336+if HAVE_PARTED
337+libexec_PROGRAMS += \
338+ udisks-helper-delete-partition \
339+ udisks-helper-create-partition \
340+ udisks-helper-modify-partition \
341+ udisks-helper-create-partition-table
342+
343 udisks_helper_delete_partition_SOURCES = job-shared.h job-delete-partition.c
344 udisks_helper_delete_partition_CPPFLAGS = $(AM_CPPFLAGS)
345 udisks_helper_delete_partition_LDADD = $(GLIB_LIBS) libpartutil.la
346@@ -63,11 +64,17 @@ udisks_helper_modify_partition_LDADD = $(GLIB_LIBS) libpartutil.la
347 udisks_helper_create_partition_table_SOURCES = job-shared.h job-create-partition-table.c
348 udisks_helper_create_partition_table_CPPFLAGS = $(AM_CPPFLAGS)
349 udisks_helper_create_partition_table_LDADD = $(GLIB_LIBS) libpartutil.la
350+endif
351
352 udisks_helper_change_filesystem_label_SOURCES = job-shared.h job-change-filesystem-label.c
353 udisks_helper_change_filesystem_label_CPPFLAGS = $(AM_CPPFLAGS)
354 udisks_helper_change_filesystem_label_LDADD = $(GLIB_LIBS)
355
356+if HAVE_LIBATASMART
357+libexec_PROGRAMS += \
358+ udisks-helper-ata-smart-collect \
359+ udisks-helper-ata-smart-selftest
360+
361 udisks_helper_ata_smart_selftest_SOURCES = job-shared.h job-ata-smart-selftest.c
362 udisks_helper_ata_smart_selftest_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
363 udisks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
364@@ -75,6 +82,7 @@ udisks_helper_ata_smart_selftest_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
365 udisks_helper_ata_smart_collect_SOURCES = job-ata-smart-collect.c
366 udisks_helper_ata_smart_collect_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS) $(GLIB_CFLAGS)
367 udisks_helper_ata_smart_collect_LDADD = $(LIBATASMART_LIBS) $(GLIB_LIBS)
368+endif
369
370 udisks_helper_linux_md_remove_component_SOURCES = job-shared.h job-linux-md-remove-component.c
371 udisks_helper_linux_md_remove_component_CPPFLAGS = $(AM_CPPFLAGS)
372diff --git a/src/helpers/partutil.c b/src/helpers/partutil.c
373index 72a8fe3..8893a39 100644
374--- a/src/helpers/partutil.c
375+++ b/src/helpers/partutil.c
376@@ -62,7 +62,6 @@ DEBUG (const gchar *format,
377 # include <config.h>
378 #endif
379
380-#define USE_PARTED
381 #ifdef USE_PARTED
382 #include <parted/parted.h>
383 #endif
384@@ -928,6 +927,7 @@ part_table_parse_apple (int fd,
385 return p;
386 }
387
388+#ifdef USE_PARTED
389 static PartitionTable *
390 part_table_load_from_disk_from_file (char *device_file)
391 {
392@@ -948,6 +948,7 @@ part_table_load_from_disk_from_file (char *device_file)
393 out:
394 return ret;
395 }
396+#endif
397
398 PartitionTable *
399 part_table_load_from_disk (int fd)
400diff --git a/src/port-private.h b/src/port-private.h
401index cc48376..a91532f 100644
402--- a/src/port-private.h
403+++ b/src/port-private.h
404@@ -23,7 +23,6 @@
405
406 #include <dbus/dbus-glib.h>
407 #include <gudev/gudev.h>
408-#include <atasmart.h>
409
410 #include "types.h"
411
412diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am
413index 06bb566..01c693b 100644
414--- a/src/probers/Makefile.am
415+++ b/src/probers/Makefile.am
416@@ -22,8 +22,6 @@ INCLUDES = \
417
418 udevhelperdir = $(slashlibdir)/udev
419 udevhelper_PROGRAMS = udisks-part-id \
420- udisks-dm-export \
421- udisks-probe-ata-smart \
422 udisks-probe-sas-expander \
423 $(NULL)
424
425@@ -35,17 +33,23 @@ udisks_part_id_SOURCES = part-id.c
426 udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
427 udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la
428
429+if HAVE_DEVMAPPER
430+udevhelper_PROGRAMS += udisks-dm-export
431 udisks_dm_export_SOURCES = udisks-dm-export.c
432 udisks_dm_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS) $(GLIB_CFLAGS)
433 udisks_dm_export_LDADD = $(DEVMAPPER_LIBS) $(GLIB_LIBS)
434+endif
435
436 udisks_lvm_pv_export_SOURCES = udisks-lvm-pv-export.c
437 udisks_lvm_pv_export_CPPFLAGS = $(AM_CPPFLAGS) $(DEVMAPPER_CFLAGS) $(LVM2_CFLAGS) $(GLIB_CFLAGS)
438 udisks_lvm_pv_export_LDADD = $(DEVMAPPER_LIBS) $(LVM2_LIBS) $(GLIB_LIBS)
439
440+if HAVE_LIBATASMART
441+udevhelper_PROGRAMS += udisks-probe-ata-smart
442 udisks_probe_ata_smart_SOURCES = udisks-probe-ata-smart.c
443 udisks_probe_ata_smart_CPPFLAGS = $(AM_CPPFLAGS) $(LIBATASMART_CFLAGS)
444 udisks_probe_ata_smart_LDADD = $(LIBATASMART_LIBS)
445+endif
446
447 udisks_probe_sas_expander_SOURCES = udisks-probe-sas-expander.c
448 udisks_probe_sas_expander_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
449diff --git a/tools/udisks.c b/tools/udisks.c
450index 97e80d7..d30159b 100644
451--- a/tools/udisks.c
452+++ b/tools/udisks.c
453@@ -43,7 +43,9 @@
454 #include <dbus/dbus-glib.h>
455 #include <dbus/dbus-glib-lowlevel.h>
456
457+#ifdef HAVE_LIBATASMART
458 #include <atasmart.h>
459+#endif
460
461 #include "udisks-daemon-glue.h"
462 #include "udisks-device-glue.h"
463@@ -983,6 +985,7 @@ end_highlight (void)
464 g_print ("\x1B[0m");
465 }
466
467+#ifdef HAVE_LIBATASMART
468 static const gchar *
469 ata_smart_status_to_desc (const gchar *status,
470 gboolean *out_highlight)
471@@ -1163,6 +1166,7 @@ print_ata_smart_attr (SkDisk *d,
472 g_free (threshold_str);
473 g_free (pretty);
474 }
475+#endif
476
477 static void
478 do_show_info (const char *object_path)
479@@ -1445,7 +1449,7 @@ do_show_info (const char *object_path)
480 g_print (" if speed: %" G_GINT64_FORMAT " bits/s\n", props->drive_connection_speed);
481
482 /* ------------------------------------------------------------------------------------------------- */
483-
484+#ifdef HAVE_LIBATASMART
485 if (!props->drive_ata_smart_is_available)
486 {
487 g_print (" ATA SMART: not available\n");
488@@ -1498,7 +1502,9 @@ do_show_info (const char *object_path)
489 }
490
491 }
492-
493+#else
494+ g_print (" ATA SMART: not supported\n");
495+#endif
496 /* ------------------------------------------------------------------------------------------------- */
497
498 }
diff --git a/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch b/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch
deleted file mode 100644
index d4efa93dd..000000000
--- a/meta-oe/recipes-support/udisks/udisks/udisks-1.0.5-fix-service-file.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From a4f6aa5be37ae6e2194c9ded2ea8c1da330f5694 Mon Sep 17 00:00:00 2001
2From: David King <amigadave@amigadave.com>
3Date: Thu, 2 Jul 2015 13:49:22 +0100
4Subject: [PATCH] Fix systemd service file
5
6udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks.
7
8https://bugzilla.redhat.com/show_bug.cgi?id=1238664
9https://bugs.freedesktop.org/show_bug.cgi?id=91191
10
11Taken-From: [1]
12[1] http://pkgs.fedoraproject.org/cgit/udisks.git/tree/udisks-1.0.5-fix-service-file.patch
13
14Upstream-Status: Pending
15
16---
17 data/Makefile.am | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/data/Makefile.am b/data/Makefile.am
21index 411ea0f..08af5f4 100644
22--- a/data/Makefile.am
23+++ b/data/Makefile.am
24@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir)
25 systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
26
27 $(systemdservice_DATA): $(systemdservice_in_files) Makefile
28- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@
29+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
30 endif
31
32 udevrulesdir = $(slashlibdir)/udev/rules.d
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
deleted file mode 100644
index 0918fedda..000000000
--- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
+++ /dev/null
@@ -1,51 +0,0 @@
1DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces that can be used to query and manipulate storage devices."
2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
4
5DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native \
6 dbus-glib-native \
7"
8# optional dependencies: device-mapper parted
9
10DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
11 dbus-glib-native \
12"
13
14SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
15 file://optional-depends.patch \
16 file://0001-fix-build-with-newer-glibc-versions.patch \
17 file://udisks-1.0.5-fix-service-file.patch \
18 file://0001-Make-udev-rules-directory-configurable.patch \
19 file://0001-include-sys-sysmacros.h.patch \
20 file://0001-tools-Install-bash_completion-script-in-etc-bash_com.patch \
21 file://0001-udisks-helper-Use-sh-interpreter-instead-of-bash.patch \
22 "
23
24SRC_URI[udisks.md5sum] = "70d48dcfe523a74cd7c7fbbc2847fcdd"
25SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71"
26
27inherit autotools-brokensep systemd gtk-doc distro_features_check bash-completion
28
29REQUIRED_DISTRO_FEATURES = "polkit"
30
31
32PACKAGECONFIG ??= "libdevmapper"
33PACKAGECONFIG[libdevmapper] = "--enable-devmapper,--disable-devmapper,libdevmapper"
34PACKAGECONFIG[parted] = "--enable-parted,--disable-parted,parted"
35
36EXTRA_OECONF = "--disable-man-pages --libdir=${base_libdir} --sbindir=${base_sbindir}"
37EXTRA_OEMAKE = "udevrulesdir=${nonarch_base_libdir}/udev/rules.d/"
38
39FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
40 ${datadir}/dbus-1/ \
41 ${datadir}/polkit-1 \
42 ${nonarch_base_libdir}/udev/* \
43"
44
45FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug"
46
47RPROVIDES_${PN} += "${PN}-systemd"
48RREPLACES_${PN} += "${PN}-systemd"
49RCONFLICTS_${PN} += "${PN}-systemd"
50SYSTEMD_SERVICE_${PN} = "udisks.service"
51SYSTEMD_AUTO_ENABLE = "disable"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 15:03:59 +0000