From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH 5/5] udisks: remove after one year in staging
Date: Mon, 22 Jun 2020 00:29:53 +0200 [thread overview]
Message-ID: <20200621222953.12596-5-rhi@pengutronix.de> (raw)
In-Reply-To: <20200621222953.12596-1-rhi@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
patches/udisks-1.0.0/autogen.sh | 1 -
patches/udisks-1.0.0/devmapper-optional.diff | 58 ---
patches/udisks-1.0.0/libparted-optional.diff | 90 ----
patches/udisks-1.0.0/libsgutils-optional.diff | 68 ---
patches/udisks-1.0.0/series | 4 -
patches/udisks-1.0.0/smart-optional.diff | 415 ------------------
rules/udisks.in | 54 ---
rules/udisks.make | 117 -----
8 files changed, 807 deletions(-)
delete mode 120000 patches/udisks-1.0.0/autogen.sh
delete mode 100644 patches/udisks-1.0.0/devmapper-optional.diff
delete mode 100644 patches/udisks-1.0.0/libparted-optional.diff
delete mode 100644 patches/udisks-1.0.0/libsgutils-optional.diff
delete mode 100644 patches/udisks-1.0.0/series
delete mode 100644 patches/udisks-1.0.0/smart-optional.diff
delete mode 100644 rules/udisks.in
delete mode 100644 rules/udisks.make
diff --git a/patches/udisks-1.0.0/autogen.sh b/patches/udisks-1.0.0/autogen.sh
deleted file mode 120000
index 9f8a4cb7ddcb..000000000000
--- a/patches/udisks-1.0.0/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/udisks-1.0.0/devmapper-optional.diff b/patches/udisks-1.0.0/devmapper-optional.diff
deleted file mode 100644
index 3a7a3368b820..000000000000
--- a/patches/udisks-1.0.0/devmapper-optional.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make devmapper dependency optional
-
-This patch adds a configure option for devmapper.
-When disabled, the helper program using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 11 ++++++++---
- src/probers/Makefile.am | 5 ++++-
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -173,9 +173,14 @@ if test "x$enable_libparted" = xyes; the
- fi
- AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
-
--PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
--AC_SUBST(DEVMAPPER_CFLAGS)
--AC_SUBST(DEVMAPPER_LIBS)
-+AC_ARG_ENABLE(devmapper,[ --disable-devmapper],enable_devmapper=$enableval,enable_devmapper=yes)
-+
-+if test "x$enable_devmapper" = xyes; then
-+ PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
-+ AC_SUBST(DEVMAPPER_CFLAGS)
-+ AC_SUBST(DEVMAPPER_LIBS)
-+fi
-+AM_CONDITIONAL(DEVMAPPER_ENABLED, test "x$enable_devmapper" = xyes)
-
- have_lvm2=no
- AC_ARG_ENABLE(lvm2, AS_HELP_STRING([--disable-lvm2], [disable LVM2 support]))
-Index: b/src/probers/Makefile.am
-===================================================================
---- a/src/probers/Makefile.am
-+++ b/src/probers/Makefile.am
-@@ -22,7 +22,6 @@ INCLUDES = \
-
- udevhelperdir = $(slashlibdir)/udev
- udevhelper_PROGRAMS = \
-- udisks-dm-export \
- udisks-probe-ata-smart \
- udisks-probe-sas-expander \
- $(NULL)
-@@ -31,6 +30,10 @@ if LIBPARTED_ENABLED
- udevhelper_PROGRAMS += udisks-part-id
- endif
-
-+if DEVMAPPER_ENABLED
-+udevhelper_PROGRAMS += udisks-dm-export
-+endif
-+
- if HAVE_LVM2
- udevhelper_PROGRAMS += udisks-lvm-pv-export
- endif
diff --git a/patches/udisks-1.0.0/libparted-optional.diff b/patches/udisks-1.0.0/libparted-optional.diff
deleted file mode 100644
index e5027ccf17d3..000000000000
--- a/patches/udisks-1.0.0/libparted-optional.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make libparted dependency optional
-
-This patch adds a configure option for libparted.
-When disabled, the helper programs using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 11 ++++++++---
- src/helpers/Makefile.am | 13 +++++++++----
- src/probers/Makefile.am | 6 +++++-
- 3 files changed, 22 insertions(+), 8 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -164,9 +164,14 @@ PKG_CHECK_MODULES(POLKIT_BACKEND_1, [pol
- AC_SUBST(POLKIT_BACKEND_1_CFLAGS)
- AC_SUBST(POLKIT_BACKEND_1_LIBS)
-
--PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
--AC_SUBST(LIBPARTED_CFLAGS)
--AC_SUBST(LIBPARTED_LIBS)
-+AC_ARG_ENABLE(libparted,[ --disable-libparted],enable_libparted=$enableval,enable_libparted=yes)
-+
-+if test "x$enable_libparted" = xyes; then
-+ PKG_CHECK_MODULES(LIBPARTED, [libparted >= 1.8.8])
-+ AC_SUBST(LIBPARTED_CFLAGS)
-+ AC_SUBST(LIBPARTED_LIBS)
-+fi
-+AM_CONDITIONAL(LIBPARTED_ENABLED, test "x$enable_libparted" = xyes)
-
- PKG_CHECK_MODULES(DEVMAPPER, [devmapper >= 1.02])
- AC_SUBST(DEVMAPPER_CFLAGS)
-Index: b/src/helpers/Makefile.am
-===================================================================
---- a/src/helpers/Makefile.am
-+++ b/src/helpers/Makefile.am
-@@ -19,10 +19,6 @@ INCLUDES = \
-
- libexec_PROGRAMS = \
- udisks-helper-mkfs \
-- udisks-helper-delete-partition \
-- udisks-helper-create-partition \
-- udisks-helper-modify-partition \
-- udisks-helper-create-partition-table \
- udisks-helper-change-filesystem-label \
- udisks-helper-linux-md-remove-component \
- udisks-helper-fstab-mounter \
-@@ -37,7 +33,16 @@ if SGUTILS2_ENABLED
- libexec_PROGRAMS += udisks-helper-drive-detach
- endif
-
-+if LIBPARTED_ENABLED
-+libexec_PROGRAMS += \
-+ udisks-helper-delete-partition \
-+ udisks-helper-create-partition \
-+ udisks-helper-modify-partition \
-+ udisks-helper-create-partition-table \
-+ $(NULL)
-+
- noinst_LTLIBRARIES = libpartutil.la
-+endif
- libpartutil_la_SOURCES = partutil.h partutil.c
- libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
- libpartutil_la_LIBADD = $(LIBPARTED_LIBS)
-Index: b/src/probers/Makefile.am
-===================================================================
---- a/src/probers/Makefile.am
-+++ b/src/probers/Makefile.am
-@@ -21,12 +21,16 @@ INCLUDES = \
- #
-
- udevhelperdir = $(slashlibdir)/udev
--udevhelper_PROGRAMS = udisks-part-id \
-+udevhelper_PROGRAMS = \
- udisks-dm-export \
- udisks-probe-ata-smart \
- udisks-probe-sas-expander \
- $(NULL)
-
-+if LIBPARTED_ENABLED
-+udevhelper_PROGRAMS += udisks-part-id
-+endif
-+
- if HAVE_LVM2
- udevhelper_PROGRAMS += udisks-lvm-pv-export
- endif
diff --git a/patches/udisks-1.0.0/libsgutils-optional.diff b/patches/udisks-1.0.0/libsgutils-optional.diff
deleted file mode 100644
index 75ee410806a5..000000000000
--- a/patches/udisks-1.0.0/libsgutils-optional.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make sgutils2 dependency optional
-
-This patch adds a configure option for sgutils2.
-When disabled, the helper program using it will not be built.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 23 ++++++++++++++---------
- src/helpers/Makefile.am | 5 ++++-
- 2 files changed, 18 insertions(+), 10 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,15 +120,20 @@ if test "x$GCC" = "xyes"; then
- changequote([,])dnl
- fi
-
--have_sgutils="false"
--AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
--if test x$have_sgutils != "xtrue"; then
-- AC_MSG_ERROR([libsgutils2 is needed])
--fi
--SGUTILS_CFLAGS=""
--SGUTILS_LIBS="-lsgutils2"
--AC_SUBST(SGUTILS_CFLAGS)
--AC_SUBST(SGUTILS_LIBS)
-+AC_ARG_ENABLE(sgutils2, [ --disable-sgutils2],enable_sgutils2=$enableval,enable_sgutils2=yes)
-+
-+if test "x$enable_sgutils2" = xyes; then
-+ have_sgutils="false"
-+ AC_CHECK_LIB([sgutils2], [sg_ll_inquiry], have_sgutils="true")
-+ if test x$have_sgutils != "xtrue"; then
-+ AC_MSG_ERROR([libsgutils2 is needed])
-+ fi
-+ SGUTILS_CFLAGS=""
-+ SGUTILS_LIBS="-lsgutils2"
-+ AC_SUBST(SGUTILS_CFLAGS)
-+ AC_SUBST(SGUTILS_LIBS)
-+fi
-+AM_CONDITIONAL(SGUTILS2_ENABLED, test "x$enable_sgutils2" = xyes)
-
-
- PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 147])
-Index: b/src/helpers/Makefile.am
-===================================================================
---- a/src/helpers/Makefile.am
-+++ b/src/helpers/Makefile.am
-@@ -28,12 +28,15 @@ libexec_PROGRAMS = \
- udisks-helper-fstab-mounter \
- udisks-helper-ata-smart-collect \
- udisks-helper-ata-smart-selftest \
-- udisks-helper-drive-detach \
- udisks-helper-drive-poll \
- udisks-helper-linux-md-check \
- udisks-helper-drive-benchmark \
- $(NULL)
-
-+if SGUTILS2_ENABLED
-+libexec_PROGRAMS += udisks-helper-drive-detach
-+endif
-+
- noinst_LTLIBRARIES = libpartutil.la
- libpartutil_la_SOURCES = partutil.h partutil.c
- libpartutil_la_CPPFLAGS = $(LIBPARTED_CFLAGS)
diff --git a/patches/udisks-1.0.0/series b/patches/udisks-1.0.0/series
deleted file mode 100644
index e490966aa3a3..000000000000
--- a/patches/udisks-1.0.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-libsgutils-optional.diff
-libparted-optional.diff
-devmapper-optional.diff
-smart-optional.diff
diff --git a/patches/udisks-1.0.0/smart-optional.diff b/patches/udisks-1.0.0/smart-optional.diff
deleted file mode 100644
index a5e405cd21df..000000000000
--- a/patches/udisks-1.0.0/smart-optional.diff
+++ /dev/null
@@ -1,415 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make libatasmart dependency optional
-
-This patch adds a configure option for libatasmart.
-When disabled, the helper programs using it will not be built.
-Any other code using libatasmart is guarded with appropriate ifdefs.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- configure.ac | 12 +++++++++---
- src/adapter-private.h | 1 -
- src/adapter.c | 1 -
- src/daemon.c | 4 ++++
- src/device-private.c | 2 ++
- src/device-private.h | 6 ++++++
- src/device.c | 20 ++++++++++++++++++++
- src/expander-private.h | 1 -
- src/expander.c | 1 -
- src/helpers/Makefile.am | 9 +++++++--
- src/port-private.h | 1 -
- src/probers/Makefile.am | 5 ++++-
- tools/udisks.c | 6 ++++++
- 13 files changed, 58 insertions(+), 11 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -204,9 +204,15 @@ if test "x$enable_dmmp" != "xno"; then
- fi
- AM_CONDITIONAL(HAVE_DMMP, [test "$have_dmmp" = "yes"])
-
--PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
--AC_SUBST(LIBATASMART_CFLAGS)
--AC_SUBST(LIBATASMART_LIBS)
-+AC_ARG_ENABLE(libatasmart,[ --disable-libatasmart],enable_libatasmart=$enableval,enable_libatasmart=yes)
-+
-+if test "x$enable_libatasmart" = xyes; then
-+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
-+ AC_SUBST(LIBATASMART_CFLAGS)
-+ AC_SUBST(LIBATASMART_LIBS)
-+ AC_DEFINE(LIBATASMART_ENABLED,[1],[libatasmart enabled])
-+fi
-+AM_CONDITIONAL(LIBATASMART_ENABLED, test "x$enable_libatasmart" = xyes)
-
- PKG_CHECK_MODULES(LIBUDEV, [libudev >= 143])
- AC_SUBST(LIBUDEV_CFLAGS)
-Index: b/src/device-private.h
-===================================================================
---- a/src/device-private.h
-+++ b/src/device-private.h
-@@ -23,7 +23,9 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "types.h"
-
-@@ -224,7 +226,9 @@ struct DevicePrivate
-
- gboolean drive_ata_smart_is_available;
- guint64 drive_ata_smart_time_collected;
-+#ifdef LIBATASMART_ENABLED
- SkSmartOverall drive_ata_smart_status;
-+#endif
- void *drive_ata_smart_blob;
- gsize drive_ata_smart_blob_size;
-
-@@ -389,10 +393,12 @@ void device_set_dm_name (Device *device,
- void device_set_slaves_objpath (Device *device, GStrv value);
- void device_set_holders_objpath (Device *device, GStrv value);
-
-+#ifdef LIBATASMART_ENABLED
- void device_set_drive_ata_smart_is_available (Device *device, gboolean value);
- void device_set_drive_ata_smart_time_collected (Device *device, guint64 value);
- void device_set_drive_ata_smart_status (Device *device, SkSmartOverall value);
- void device_set_drive_ata_smart_blob_steal (Device *device, gchar *blob, gsize blob_size);
-+#endif
-
- G_END_DECLS
-
-Index: b/src/device.c
-===================================================================
---- a/src/device.c
-+++ b/src/device.c
-@@ -49,7 +49,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <gudev/gudev.h>
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "daemon.h"
- #include "device.h"
-@@ -658,6 +660,7 @@ get_property (GObject *object,
- case PROP_DRIVE_ATA_SMART_TIME_COLLECTED:
- g_value_set_uint64 (value, device->priv->drive_ata_smart_time_collected);
- break;
-+#ifdef LIBATASMART_ENABLED
- case PROP_DRIVE_ATA_SMART_STATUS:
- {
- const gchar *status;
-@@ -668,6 +671,7 @@ get_property (GObject *object,
- g_value_set_string (value, status);
- }
- break;
-+#endif
- case PROP_DRIVE_ATA_SMART_BLOB:
- {
- GArray *a;
-@@ -1740,7 +1744,9 @@ device_init (Device *device)
- device->priv->slaves_objpath = g_ptr_array_new ();
- device->priv->holders_objpath = g_ptr_array_new ();
-
-+#ifdef LIBATASMART_ENABLED
- device->priv->drive_ata_smart_status = -1;
-+#endif
- }
-
- static void
-@@ -3830,6 +3836,7 @@ update_info_linux_md (Device *device)
- static gboolean
- update_info_drive_ata_smart (Device *device)
- {
-+#ifdef LIBATASMART_ENABLED
- gboolean ata_smart_is_available;
-
- ata_smart_is_available = FALSE;
-@@ -3842,6 +3849,7 @@ update_info_drive_ata_smart (Device *dev
- * collecting data is done in separate routines, see the
- * device_drive_ata_smart_refresh_data() function for details.
- */
-+#endif
-
- return TRUE;
- }
-@@ -9646,6 +9654,7 @@ device_filesystem_set_label (Device *dev
-
- /*--------------------------------------------------------------------------------------------------------------*/
-
-+#ifdef LIBATASMART_ENABLED
- /* may be called with context==NULL */
- static void
- drive_ata_smart_refresh_data_completed_cb (DBusGMethodInvocation *context,
-@@ -9848,6 +9857,7 @@ device_drive_ata_smart_refresh_data_auth
- ;
- PROFILE ("device_drive_ata_smart_refresh_data_authorized_cb(device=%s) end", device->priv->native_path);
- }
-+#endif /* LIBATASMART_ENABLED */
-
- /* may be called with context==NULL */
- gboolean
-@@ -9855,6 +9865,7 @@ device_drive_ata_smart_refresh_data (Dev
- char **options,
- DBusGMethodInvocation *context)
- {
-+#ifdef LIBATASMART_ENABLED
- const gchar *action_id;
-
- action_id = NULL;
-@@ -9875,10 +9886,14 @@ device_drive_ata_smart_refresh_data (Dev
- g_strfreev);
-
- return TRUE;
-+#else
-+ return FALSE;
-+#endif
- }
-
- /*--------------------------------------------------------------------------------------------------------------*/
-
-+#ifdef LIBATASMART_ENABLED
- static void
- drive_ata_smart_initiate_selftest_completed_cb (DBusGMethodInvocation *context,
- Device *device,
-@@ -9975,6 +9990,7 @@ device_drive_ata_smart_initiate_selftest
- out:
- ;
- }
-+#endif /* LIBATASMART_ENABLED */
-
- gboolean
- device_drive_ata_smart_initiate_selftest (Device *device,
-@@ -9982,6 +9998,7 @@ device_drive_ata_smart_initiate_selftest
- gchar **options,
- DBusGMethodInvocation *context)
- {
-+#ifdef LIBATASMART_ENABLED
- if (!device->priv->drive_ata_smart_is_available)
- {
- throw_error (context, ERROR_FAILED, "Device does not support ATA SMART");
-@@ -10003,6 +10020,9 @@ device_drive_ata_smart_initiate_selftest
-
- out:
- return TRUE;
-+#else
-+ return FALSE;
-+#endif
- }
-
- /*--------------------------------------------------------------------------------------------------------------*/
-Index: b/src/device-private.c
-===================================================================
---- a/src/device-private.c
-+++ b/src/device-private.c
-@@ -1354,6 +1354,7 @@ device_set_holders_objpath (Device *devi
- }
- }
-
-+#ifdef LIBATASMART_ENABLED
- void
- device_set_drive_ata_smart_is_available (Device *device,
- gboolean value)
-@@ -1400,6 +1401,7 @@ device_set_drive_ata_smart_blob_steal (D
-
- emit_changed (device, "drive_ata_smart_blob");
- }
-+#endif /* LIBATASMART_ENABLED */
-
-
- void
-Index: b/tools/udisks.c
-===================================================================
---- a/tools/udisks.c
-+++ b/tools/udisks.c
-@@ -43,7 +43,9 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
-+#ifdef LIBATASMART_ENABLED
- #include <atasmart.h>
-+#endif
-
- #include "udisks-daemon-glue.h"
- #include "udisks-device-glue.h"
-@@ -1003,6 +1005,7 @@ ata_smart_status_to_desc (const gchar *s
- return desc;
- }
-
-+#ifdef LIBATASMART_ENABLED
- static gchar *
- get_ata_smart_unit (guint unit,
- guint64 pretty_value)
-@@ -1137,6 +1140,7 @@ print_ata_smart_attr (SkDisk *d,
- g_free (threshold_str);
- g_free (pretty);
- }
-+#endif
-
- static void
- do_show_info (const char *object_path)
-@@ -1419,6 +1423,7 @@ do_show_info (const char *object_path)
-
- /* ------------------------------------------------------------------------------------------------- */
-
-+#ifdef LIBATASMART_ENABLED
- if (!props->drive_ata_smart_is_available)
- {
- g_print (" ATA SMART: not available\n");
-@@ -1471,6 +1476,7 @@ do_show_info (const char *object_path)
- }
-
- }
-+#endif
-
- /* ------------------------------------------------------------------------------------------------- */
-
-Index: b/src/helpers/Makefile.am
-===================================================================
---- a/src/helpers/Makefile.am
-+++ b/src/helpers/Makefile.am
-@@ -22,13 +22,18 @@ libexec_PROGRAMS = \
- udisks-helper-change-filesystem-label \
- udisks-helper-linux-md-remove-component \
- udisks-helper-fstab-mounter \
-- udisks-helper-ata-smart-collect \
-- udisks-helper-ata-smart-selftest \
- udisks-helper-drive-poll \
- udisks-helper-linux-md-check \
- udisks-helper-drive-benchmark \
- $(NULL)
-
-+if LIBATASMART_ENABLED
-+libexec_PROGRAMS += \
-+ udisks-helper-ata-smart-collect \
-+ udisks-helper-ata-smart-selftest \
-+ $(NULL)
-+endif
-+
- if SGUTILS2_ENABLED
- libexec_PROGRAMS += udisks-helper-drive-detach
- endif
-Index: b/src/probers/Makefile.am
-===================================================================
---- a/src/probers/Makefile.am
-+++ b/src/probers/Makefile.am
-@@ -22,7 +22,6 @@ INCLUDES = \
-
- udevhelperdir = $(slashlibdir)/udev
- udevhelper_PROGRAMS = \
-- udisks-probe-ata-smart \
- udisks-probe-sas-expander \
- $(NULL)
-
-@@ -38,6 +37,10 @@ if HAVE_LVM2
- udevhelper_PROGRAMS += udisks-lvm-pv-export
- endif
-
-+if LIBATASMART_ENABLED
-+udevhelper_PROGRAMS += udisks-probe-ata-smart
-+endif
-+
- udisks_part_id_SOURCES = part-id.c
- udisks_part_id_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUDEV_CFLAGS)
- udisks_part_id_LDADD = $(GLIB_LIBS) $(LIBUDEV_LIBS) $(top_builddir)/src/helpers/libpartutil.la
-Index: b/src/adapter-private.h
-===================================================================
---- a/src/adapter-private.h
-+++ b/src/adapter-private.h
-@@ -23,7 +23,6 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "types.h"
-
-Index: b/src/expander-private.h
-===================================================================
---- a/src/expander-private.h
-+++ b/src/expander-private.h
-@@ -23,7 +23,6 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "types.h"
-
-Index: b/src/port-private.h
-===================================================================
---- a/src/port-private.h
-+++ b/src/port-private.h
-@@ -23,7 +23,6 @@
-
- #include <dbus/dbus-glib.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "types.h"
-
-Index: b/src/adapter.c
-===================================================================
---- a/src/adapter.c
-+++ b/src/adapter.c
-@@ -30,7 +30,6 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
-
- #include "daemon.h"
- #include "adapter.h"
-Index: b/src/daemon.c
-===================================================================
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -1719,6 +1719,7 @@ mdstat_changed_event (GIOChannel *channe
- return TRUE;
- }
-
-+#ifdef LIBATASMART_ENABLED
- static gboolean
- refresh_ata_smart_data (Daemon *daemon)
- {
-@@ -1747,6 +1748,7 @@ refresh_ata_smart_data (Daemon *daemon)
-
- return FALSE;
- }
-+#endif /* LIBATASMART_ENABLED */
-
- static gboolean
- register_disks_daemon (Daemon *daemon)
-@@ -1949,12 +1951,14 @@ daemon_new (void)
- mount_file_clean_stale (l);
- g_list_free (l);
-
-+#ifdef LIBATASMART_ENABLED
- /* set up timer for refreshing ATA SMART data - we don't want to refresh immediately because
- * when adding a device we also do this...
- */
- daemon->priv->ata_smart_refresh_timer_id = g_timeout_add_seconds (ATA_SMART_REFRESH_INTERVAL_SECONDS,
- (GSourceFunc) refresh_ata_smart_data,
- daemon);
-+#endif /* LIBATASMART_ENABLED */
-
- PROFILE ("daemon_new(): end");
- return daemon;
-Index: b/src/expander.c
-===================================================================
---- a/src/expander.c
-+++ b/src/expander.c
-@@ -34,7 +34,6 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <gudev/gudev.h>
--#include <atasmart.h>
- #include <stdlib.h>
-
- #include "daemon.h"
diff --git a/rules/udisks.in b/rules/udisks.in
deleted file mode 100644
index e855c1c66179..000000000000
--- a/rules/udisks.in
+++ /dev/null
@@ -1,54 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
-
-comment "udisks conflicts with BusyBox' mount!"
- depends on BUSYBOX_MOUNT
-
-comment "udisks conflicts with BusyBox' umount!"
- depends on BUSYBOX_MOUNT
-
-menuconfig UDISKS
- tristate
- select HOST_GTK_DOC
- select HOST_LIBXSLT
- select GLIB
- select DBUS
- select DBUS_GLIB
- select POLKIT
- select UDEV
- select UDEV_LIBUDEV
- select LIBGUDEV
- # busybox mount can't handle all the options
- depends on !BUSYBOX_MOUNT || ALLYES
- depends on !BUSYBOX_UMOUNT || ALLYES
- select UTIL_LINUX_NG
- select UTIL_LINUX_NG_MOUNT
- select UTIL_LINUX_NG_UMOUNT
- select FAKE_OVERLAYFS if UDISKS_FAKE_OVERLAYFS
- select FAKE_OVERLAYFS_VAR_TMP if UDISKS_FAKE_OVERLAYFS && !FAKE_OVERLAYFS_VAR
- prompt "udisks "
- help
- abstraction for enumerating block devices
-
- Udisks is an abstraction for enumerating block
- devices and performing operations on them. Any application
- can access the org.freedesktop.UDisks. Disks service on
- the system message bus. Some operations (such as formatting
- disks etc.) are restricted using PolicyKit.
-
- STAGING: remove in ptxdist-2020.06.0
- Old version that need to be updated. Fails to build with glibc-2.28.
-
-if UDISKS
-
-config UDISKS_FAKE_OVERLAYFS
- bool
- prompt "use fake overlayfs"
- help
- This makes sure that all necessary directories and files
- are available and writeable on a readonly rootfs + tmpfs for
- writable directories.
-
-endif
-
diff --git a/rules/udisks.make b/rules/udisks.make
deleted file mode 100644
index 93bde262cbbb..000000000000
--- a/rules/udisks.make
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_UDISKS) += udisks
-
-#
-# Paths and names
-#
-UDISKS_VERSION := 1.0.0
-UDISKS_MD5 := a33fac347956e015f40e56a86d63f8ff
-UDISKS := udisks-$(UDISKS_VERSION)
-UDISKS_SUFFIX := tar.gz
-UDISKS_URL := http://hal.freedesktop.org/releases/$(UDISKS).$(UDISKS_SUFFIX)
-UDISKS_SOURCE := $(SRCDIR)/$(UDISKS).$(UDISKS_SUFFIX)
-UDISKS_DIR := $(BUILDDIR)/$(UDISKS)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-UDISKS_AUTOCONF := \
- $(CROSS_AUTOCONF_USR) \
- $(GLOBAL_LARGE_FILE_OPTION) \
- --enable-shared \
- --enable-static \
- --disable-ansi \
- --disable-man-pages \
- --disable-gtk-doc \
- --enable-gtk-doc-html \
- --enable-gtk-doc-pdf \
- --with-gnu-ld \
- --disable-sgutils2 \
- --disable-libparted \
- --disable-devmapper \
- --disable-libatasmart
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/udisks.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, udisks)
- @$(call install_fixup, udisks,PRIORITY,optional)
- @$(call install_fixup, udisks,SECTION,base)
- @$(call install_fixup, udisks,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
- @$(call install_fixup, udisks,DESCRIPTION,missing)
-
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/bin/udisks)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /sbin/umount.udisks)
-
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-daemon)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-change-filesystem-label)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-change-luks-password)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-drive-poll)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-fstab-mounter)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-linux-md-check)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-linux-md-remove-component)
- @$(call install_copy, udisks, 0, 0, 0755, -, \
- /usr/libexec/udisks-helper-mkfs)
-
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /lib/udev/rules.d/80-udisks.rules)
-
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /etc/dbus-1/system.d/org.freedesktop.UDisks.conf)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/dbus-1/system-services/org.freedesktop.UDisks.service)
-
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/share/polkit-1/actions/org.freedesktop.udisks.policy)
- @$(call install_copy, udisks, 0, 0, 0644, -, \
- /usr/lib/polkit-1/extensions/libudisks-action-lookup.so)
-
-ifdef PTXCONF_UDISKS_FAKE_OVERLAYFS
- @$(call install_copy, udisks, 0, 0, 0755, /var/tmp/media)
- @$(call install_link, udisks, var/tmp/media, /media)
- @$(call install_link, udisks, ../tmp/udisks, \
- /var/lib/udisks)
- @$(call install_copy, udisks, 0, 0, 0755, \
- /var/tmp/udisks)
-else
- @$(call install_copy, udisks, 0, 0, 0755, /media)
- @$(call install_copy, udisks, 0, 0, 0755, \
- /var/lib/udisks)
-endif
-
- @$(call install_finish, udisks)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.27.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2020-06-21 22:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-21 22:29 [ptxdist] [PATCH 1/5] ustr: move to staging Roland Hieber
2020-06-21 22:29 ` [ptxdist] [PATCH 2/5] dc3dd: remove after one year in staging Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 3/5] mono: " Roland Hieber
2020-06-26 11:00 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` [ptxdist] [PATCH 4/5] sepolgen: " Roland Hieber
2020-06-22 12:26 ` Michael Olbrich
2020-06-22 12:56 ` Ladislav Michl
2020-06-28 21:20 ` [ptxdist] [PATCH v2] " Roland Hieber
2020-06-28 21:24 ` [ptxdist] [PATCH v3] " Roland Hieber
2020-07-06 6:38 ` Michael Olbrich
2020-07-06 12:49 ` [ptxdist] [PATCH v2] " Roland Hieber
2020-07-07 5:45 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-06-21 22:29 ` Roland Hieber [this message]
2020-06-26 11:00 ` [ptxdist] [APPLIED] udisks: " Michael Olbrich
2020-06-26 11:00 ` [ptxdist] [APPLIED] ustr: move to staging Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200621222953.12596-5-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox