From mboxrd@z Thu Jan 1 00:00:00 1970 From: aduskett at gmail.com Date: Wed, 22 Jul 2020 18:08:08 -0700 Subject: [Buildroot] [PATCH 10/12] package/udisks: bump version to 2.9.0 In-Reply-To: <20200723010810.3237608-1-aduskett@gmail.com> References: <20200723010810.3237608-1-aduskett@gmail.com> Message-ID: <20200723010810.3237608-11-aduskett@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net From: Adam Duskett Changes include: - Remove upstream patches - Change the upstream url from freedesktop to github. Instead of using the github macro, download the provided release tarball. This prevents having to use autoreconf. - Add host-polkit, libblockdev, and libxslt as dependencies. - Remove the --disable-remote-access and --disable-man-pages conf opt, as they no longer exist. - Disable all new options by default. Signed-off-by: Adam Duskett --- ...-fix-build-with-newer-glibc-versions.patch | 29 ------- .../0002-Fix-systemd-service-file.patch | 33 -------- ...issue-with-missing-sys-sysmacros.h-i.patch | 81 ------------------- package/udisks/Config.in | 21 +++-- package/udisks/udisks.hash | 4 +- package/udisks/udisks.mk | 22 +++-- 6 files changed, 33 insertions(+), 157 deletions(-) delete mode 100644 package/udisks/0001-fix-build-with-newer-glibc-versions.patch delete mode 100644 package/udisks/0002-Fix-systemd-service-file.patch delete mode 100644 package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch diff --git a/package/udisks/0001-fix-build-with-newer-glibc-versions.patch b/package/udisks/0001-fix-build-with-newer-glibc-versions.patch deleted file mode 100644 index 336fc440a6..0000000000 --- a/package/udisks/0001-fix-build-with-newer-glibc-versions.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 - -From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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 - #include - #include - #include --- -cgit v0.10.2 diff --git a/package/udisks/0002-Fix-systemd-service-file.patch b/package/udisks/0002-Fix-systemd-service-file.patch deleted file mode 100644 index ea347aef73..0000000000 --- a/package/udisks/0002-Fix-systemd-service-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bf8b4362cef24a6f747e4329305a4939c8f585d1 Mon Sep 17 00:00:00 2001 -From: David King -Date: Thu, 2 Jul 2015 13:49:22 +0100 -Subject: [PATCH] Fix systemd service file - -udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks. - -https://bugzilla.redhat.com/show_bug.cgi?id=1238664 -https://bugs.freedesktop.org/show_bug.cgi?id=91191 - -[This patch has been backported from upstream: -https://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=bf8b4362cef24a6f747e4329305a4939c8f585d1] -Signed-off-by: Pieterjan Camerlynck ---- - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..08af5f4 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir) - systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) - - $(systemdservice_DATA): $(systemdservice_in_files) Makefile -- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ -+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - endif - - udevrulesdir = $(slashlibdir)/udev/rules.d --- -2.7.4 - diff --git a/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch b/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch deleted file mode 100644 index 71152e5de3..0000000000 --- a/package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d934b0fa5ce24a8fd1987b916e435ba991c2ef64 Mon Sep 17 00:00:00 2001 -From: Vadim Kochan -Date: Mon, 31 Dec 2018 11:00:46 +0200 -Subject: [PATCH] Fix compilation issue due to missing sys/sysmacros.h include - -glibc 2.28+ no longer include from , so - must now be explicitly included to use the major, -minor and makedev macros. - -Signed-off-by: Vadim Kochan ---- - src/daemon.c | 1 + - src/device.c | 1 + - src/mount-monitor.c | 1 + - tools/udisks.c | 1 + - tools/umount-udisks.c | 1 + - 5 files changed, 5 insertions(+) - -diff --git a/src/daemon.c b/src/daemon.c -index fafcf9a..4303a6d 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/device.c b/src/device.c -index 2ae7f38..20920df 100644 ---- a/src/device.c -+++ b/src/device.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/mount-monitor.c b/src/mount-monitor.c -index 573a69c..0cfa167 100644 ---- a/src/mount-monitor.c -+++ b/src/mount-monitor.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/tools/udisks.c b/tools/udisks.c -index 97e80d7..22a7d87 100644 ---- a/tools/udisks.c -+++ b/tools/udisks.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c -index 2813fe0..d915660 100644 ---- a/tools/umount-udisks.c -+++ b/tools/umount-udisks.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.14.1 - diff --git a/package/udisks/Config.in b/package/udisks/Config.in index 2c0d0dab52..f400e9d946 100644 --- a/package/udisks/Config.in +++ b/package/udisks/Config.in @@ -1,20 +1,27 @@ config BR2_PACKAGE_UDISKS bool "udisks" - depends on BR2_ENABLE_LOCALE # parted + depends on BR2_ENABLE_LOCALE # libblockdev, parted depends on BR2_HOST_GCC_AT_LEAST_4_9 # spidermonkey depends on BR2_INSTALL_LIBSTDCPP # spidermonkey depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libblockdev -> gpg2, libgpgme, libassuan + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libblockdev -> volume-key depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit - depends on BR2_USE_MMU # lvm2 - depends on BR2_USE_WCHAR # dbus-glib -> glib2 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # polkit, lvm2, parted - depends on !BR2_STATIC_LIBS # lvm2, spidermonkey + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libblockdev -> volume-key -> cryptsetup + depends on BR2_USE_MMU # libblockdev, dbus, lvm2, volume-key + depends on BR2_USE_WCHAR # dbus-glib -> glib2, libblockdev -> volume-key + depends on !BR2_TOOLCHAIN_USES_UCLIBC # libblockdev, polkit, lvm2, parted + depends on !BR2_STATIC_LIBS # lvm2, spidermonkey, libblockdev -> volume-key select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_LIBATASMART + select BR2_PACKAGE_LIBBLOCKDEV + select BR2_PACKAGE_LIBBLOCKDEV_CRYPTO + select BR2_PACKAGE_LIBBLOCKDEV_FS select BR2_PACKAGE_LIBGUDEV + select BR2_PACKAGE_LIBXSLT select BR2_PACKAGE_LVM2 select BR2_PACKAGE_PARTED select BR2_PACKAGE_POLKIT @@ -43,7 +50,6 @@ config BR2_PACKAGE_UDISKS_LVM2 comment "lvm2 support needs a glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC - endif comment "udisks needs udev /dev management" @@ -52,7 +58,10 @@ comment "udisks needs udev /dev management" comment "udisks needs a glibc or musl toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" depends on BR2_USE_MMU + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_ENABLE_LOCALE || BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_INSTALL_LIBSTDCPP || \ BR2_STATIC_LIBS || \ diff --git a/package/udisks/udisks.hash b/package/udisks/udisks.hash index b40161e323..7f81e5bbe5 100644 --- a/package/udisks/udisks.hash +++ b/package/udisks/udisks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz -sha256 7d30f41a79a9b453b4972a6d7e3425ff104b39232891bde8ba659f1adb21f771 COPYING +sha256 25b09265d71b9b97069e4a2fae10f696a851e0b812e69b20bcc4b23efee1ad34 udisks-2.9.0.tar.bz2 +sha256 98046e932dc6c739001e79d7079a3bd958fc55475dcd917d27f884c0c93525cc COPYING diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk index fe8932a92e..d76d51cb1b 100644 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@ -4,16 +4,16 @@ # ################################################################################ -UDISKS_VERSION = 1.0.5 -UDISKS_SITE = http://hal.freedesktop.org/releases +UDISKS_VERSION = 2.9.0 +UDISKS_SOURCE = udisks-$(UDISKS_VERSION).tar.bz2 +UDISKS_SITE = https://github.com/storaged-project/udisks/releases/download/udisks-$(UDISKS_VERSION) UDISKS_LICENSE = GPL-2.0+ UDISKS_LICENSE_FILES = COPYING -# For 0002-Fix-systemd-service-file.patch -UDISKS_AUTORECONF = YES UDISKS_DEPENDENCIES = \ sg3_utils \ host-pkgconf \ + host-polkit \ udev \ dbus \ dbus-glib \ @@ -21,9 +21,19 @@ UDISKS_DEPENDENCIES = \ parted \ lvm2 \ libatasmart \ - libgudev + libgudev \ + libblockdev \ + libxslt -UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages +UDISKS_CONF_OPTS = \ + --disable-bcache \ + --disable-btrfs \ + --disable-introspection \ + --disable-iscsi \ + --disable-lsm \ + --disable-man \ + --disable-vdo \ + --disable-zram ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) UDISKS_CONF_OPTS += --enable-lvm2 -- 2.26.2