udisks bump to version 2.8.4
cover udisks bump to version 2.8.4
Hi All,
this patchset bumps udisks version to 2.8.4 while adding new packages required as dependencies:
- libbytesize
- volume_key
- libblockdev
Libblockdev requires gobject-introspection so I've taken pending Adam Duskett's patchset[1] to make it work. Also it needs Arnout Vandecappelle's "Introduce cross-bin directory" patchset[2].
[1]: https://patchwork.ozlabs.org/project/buildroot/list/?series=157909
[2]: https://patchwork.ozlabs.org/project/buildroot/list/?series=156716
All packages have been tested succesfully with ./utils/test-pkg -a
Giulio Benetti (4):
package/libbytesize: add new package
package/volume_key: add new package
package/libblockdev: add new package
package/udisks: bump version to 2.8.4
DEVELOPERS | 4 + package/Config.in | 3 + package/libblockdev/Config.in | 22 +++++ package/libblockdev/libblockdev.hash | 3 + package/libblockdev/libblockdev.mk | 40 +++++++++ package/libbytesize/Config.in | 10 +++ package/libbytesize/libbytesize.hash | 3 + package/libbytesize/libbytesize.mk | 15 ++++ ...-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 | 31 ++++--- package/udisks/udisks.hash | 4 +- package/udisks/udisks.mk | 23 ++++-- ...ove-po-Makefile.in-entry-from-AC_CON.patch | 28 +++++++ package/volume_key/Config.in | 19 +++++ package/volume_key/volume_key.hash | 3 + package/volume_key/volume_key.mk | 22 +++++ 18 files changed, 209 insertions(+), 164 deletions(-) create mode 100644 package/libblockdev/Config.in create mode 100644 package/libblockdev/libblockdev.hash create mode 100644 package/libblockdev/libblockdev.mk create mode 100644 package/libbytesize/Config.in create mode 100644 package/libbytesize/libbytesize.hash create mode 100644 package/libbytesize/libbytesize.mk 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 create mode 100644 package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch create mode 100644 package/volume_key/Config.in create mode 100644 package/volume_key/volume_key.hash create mode 100644 package/volume_key/volume_key.mk
Signature · 1 line
2.20.1
PATCH 1/4 package/libbytesize: add new package
Libbytesize is a tiny library providing a C "class" for working with arbitrary big sizes in bytes.
--- DEVELOPERS | 1 + package/Config.in | 1 + package/libbytesize/Config.in | 10 ++++++++++ package/libbytesize/libbytesize.hash | 3 +++ package/libbytesize/libbytesize.mk | 15 +++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/libbytesize/Config.in create mode 100644 package/libbytesize/libbytesize.hash create mode 100644 package/libbytesize/libbytesize.mk
DEVELOPERS +1 -0
@@ -1009,6 +1009,7 @@ F: package/xapian/ N: Giulio Benetti <[email protected]> F: package/at/ +F: package/libbytesize/ F: package/libnspr/ F: package/libnss/ F: package/minicom/
package/Config.in +1 -0
@@ -1782,6 +1782,7 @@ menu "Other" source "package/libavl/Config.in" source "package/libb64/Config.in" source "package/libbsd/Config.in" + source "package/libbytesize/Config.in" source "package/libcap/Config.in" source "package/libcap-ng/Config.in" source "package/libcgroup/Config.in"
package/libbytesize/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBBYTESIZE + bool "libbytesize" + select BR2_PACKAGE_GMP + select BR2_PACKAGE_MPFR + select BR2_PACKAGE_PCRE2 + help + A tiny library providing a C "class" for working with + arbitrary big sizes in bytes. + + https://github.com/storaged-project/libbytesize/
package/libbytesize/libbytesize.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally calculated +sha256 e2063d5123fca5c347d561a032e406b9b72b94f3c30f7159bb4619c5aef02ef4 libbytesize-2.2.tar.gz +sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE
package/libbytesize/libbytesize.mk new file +15 -0
@@ -0,0 +1,15 @@ +################################################################################ +# +# libbytesize +# +################################################################################ + +LIBBYTESIZE_VERSION = 2.2 +LIBBYTESIZE_SITE = $(call github,storaged-project,libbytesize,$(LIBBYTESIZE_VERSION)) +LIBBYTESIZE_LICENSE = LGPL-2.1+ +LIBBYTESIZE_LICENSE_FILES = LICENSE +LIBBYTESIZE_DEPENDENCIES = gmp mpfr pcre2 host-pkgconf +LIBBYTESIZE_INSTALL_STAGING = YES +LIBBYTESIZE_AUTORECONF = YES + +$(eval $(autotools-package))
Signature · 1 line
2.20.1
PATCH 1/4 package/libbytesize: add new package
Quoted 4 lines · On Mon, 17 Feb 2020 15:30:27 +0100 Giulio Benetti…
Libbytesize is a tiny library providing a C "class" for working with arbitrary big sizes in bytes.
Signed-off-by Giulio Benetti <[email protected]>
Quoted 10 lines
--- DEVELOPERS | 1 + package/Config.in | 1 + package/libbytesize/Config.in | 10 ++++++++++ package/libbytesize/libbytesize.hash | 3 +++ package/libbytesize/libbytesize.mk | 15 +++++++++++++++ 5 files changed, 30 insertions(+) create mode 100644 package/libbytesize/Config.in create mode 100644 package/libbytesize/libbytesize.hash create mode 100644 package/libbytesize/libbytesize.mk
Because the rest of the series has been marked as Changes Requested due to the feedback that was provided, I have also marked this particular patch as Changes Requested. It doesn't make a whole lot of sense to have this libbytesize library without the rest of the series.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/4 package/volume_key: add new package
In reply to Giulio BenettiThe volume_key project provides a libvolume_key, a library for manipulating storage volume encryption keys and storing them separately from volumes, and an associated command-line tool, named volume_key.
--- DEVELOPERS | 1 + package/Config.in | 1 + ...ove-po-Makefile.in-entry-from-AC_CON.patch | 28 +++++++++++++++++++ package/volume_key/Config.in | 19 +++++++++++++ package/volume_key/volume_key.hash | 3 ++ package/volume_key/volume_key.mk | 22 +++++++++++++++ 6 files changed, 74 insertions(+) create mode 100644 package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch create mode 100644 package/volume_key/Config.in create mode 100644 package/volume_key/volume_key.hash create mode 100644 package/volume_key/volume_key.mk
DEVELOPERS +1 -0
@@ -1016,6 +1016,7 @@ F: package/minicom/ F: package/nfs-utils/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/volume_key/ N: Gregory Dymarek <[email protected]> F: package/ding-libs/
package/Config.in +1 -0
@@ -1310,6 +1310,7 @@ menu "Crypto" source "package/tpm2-tss/Config.in" source "package/trousers/Config.in" source "package/ustream-ssl/Config.in" + source "package/volume_key/Config.in" source "package/wolfssl/Config.in" endmenu
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +28 -0
@@ -0,0 +1,28 @@ +From d1142e667f4f2f2fcd2d36a006919325c1a4377e Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Sat, 25 Jan 2020 17:24:38 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in entry from + AC_CONFIG_FILES + +AC_CONFIG_FILES should not contain po/Makefile.in file because +gettextize will re-add it again causing build failure. + +Signed-off-by: Giulio Benetti <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7d3d27a..f4295ff 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -244,5 +244,5 @@ if test "$GCC" = yes ; then + fi + + dnl po/Makefile +-AC_CONFIG_FILES([Makefile contrib/Makefile doc/Makefile lib/Makefile po/Makefile.in python/Makefile python/python/Makefile python/python3/Makefile src/Makefile tests/Makefile]) ++AC_CONFIG_FILES([Makefile contrib/Makefile doc/Makefile lib/Makefile python/Makefile python/python/Makefile python/python3/Makefile src/Makefile tests/Makefile]) + AC_OUTPUT +-- +2.20.1 +
package/volume_key/Config.in new file +19 -0
@@ -0,0 +1,19 @@ +config BR2_PACKAGE_VOLUME_KEY + bool "volume_key" + depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup, libassuan, libglib2, libgpgme, libnss + depends on BR2_USE_MMU # cryptsetup, libassuan, libglib2, libgpgme + depends on !BR2_STATIC_LIBS # cryptsetup, libnss + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libassuan + select BR2_PACKAGE_CRYPTSETUP + select BR2_PACKAGE_LIBASSUAN + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LIBNSS + help + The volume_key project provides a libvolume_key, a library for manipulating + storage volume encryption keys and storing them separately from volumes, and an + associated command-line tool, named volume_key. + + https://pagure.io/volume_key
package/volume_key/volume_key.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally calculated +sha256 f83146352464048f823c164e755dc10da0e06db024de5b1b6f78beeb8438dc22 volume_key-f56614199726ba1897d8687f0927535693b6603f.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/volume_key/volume_key.mk new file +22 -0
@@ -0,0 +1,22 @@ +################################################################################ +# +# volume_key +# +################################################################################ + +VOLUME_KEY_VERSION = f56614199726ba1897d8687f0927535693b6603f +VOLUME_KEY_SITE = https://pagure.io/volume_key.git +VOLUME_KEY_SITE_METHOD = git +VOLUME_KEY_LICENSE = GPL-2.0+ +VOLUME_KEY_LICENSE_FILES = COPYING +VOLUME_KEY_DEPENDENCIES = cryptsetup libglib2 libgpgme libnss $(TARGET_NLS_DEPENDENCIES) +VOLUME_KEY_INSTALL_STAGING = YES +VOLUME_KEY_AUTORECONF = YES +VOLUME_KEY_GETTEXTIZE = YES + +VOLUME_KEY_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \ + --with-gpgme-prefix=$(STAGING_DIR)/usr \ + --without-python \ + --without-python3 + +$(eval $(autotools-package))
Signature · 1 line
2.20.1
PATCH 2/4 package/volume_key: add new package
Hello,
DEVELOPERS F: package/minicom/ · line 1019
Quoted 9 lines · On Mon, 17 Feb 2020 15:30:28 +0100 Giulio Benetti…
DEVELOPERS +1
-0@@ -1016,6 +1016,7 @@ F: package/minicom/ F: package/nfs-utils/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/volume_key/
Would you mind naming the package volume-key instead of volume_key ?
Quoted 6 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +0
-0
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch line 10
Quoted 10 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +10
-0@@ -0,0 +1,28 @@ +From d1142e667f4f2f2fcd2d36a006919325c1a4377e Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Sat, 25 Jan 2020 17:24:38 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in entry from + AC_CONFIG_FILES + +AC_CONFIG_FILES should not contain po/Makefile.in file because +gettextize will re-add it again causing build failure. + +Signed-off-by: Giulio Benetti <[email protected]>
Was this reported upstream?
Quoted 15 lines
package/volume_key/Config.in new file +9
-0@@ -0,0 +1,19 @@ +config BR2_PACKAGE_VOLUME_KEY + bool "volume_key" + depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup, libassuan, libglib2, libgpgme, libnss + depends on BR2_USE_MMU # cryptsetup, libassuan, libglib2, libgpgme + depends on !BR2_STATIC_LIBS # cryptsetup, libnss + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libassuan + select BR2_PACKAGE_CRYPTSETUP
package/volume_key/Config.in line 19
Quoted 10 lines
package/volume_key/Config.in new file +10
-0+ select BR2_PACKAGE_LIBASSUAN + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LIBNSS + help + The volume_key project provides a libvolume_key, a library for manipulating + storage volume encryption keys and storing them separately from volumes, and an + associated command-line tool, named volume_key. + + https://pagure.io/volume_key
You need a Config.in comment about the (numerous) dependencies.
package/volume_key/volume_key.mk line 7
Quoted 13 lines
package/volume_key/volume_key.mk new file +7
-0@@ -0,0 +1,22 @@ +################################################################################ +# +# volume_key +# +################################################################################ + +VOLUME_KEY_VERSION = f56614199726ba1897d8687f0927535693b6603f
Why not use the 0.3.12 release ?
package/volume_key/volume_key.mk line 10
Quoted 3 lines
package/volume_key/volume_key.mk new file +3
-0+VOLUME_KEY_SITE = https://pagure.io/volume_key.git +VOLUME_KEY_SITE_METHOD = git +VOLUME_KEY_LICENSE = GPL-2.0+
I don't see the "or later" option in any of the source files, so shouldn't this be GPL-2.0 ?
package/volume_key/volume_key.mk line 17
Quoted 7 lines
package/volume_key/volume_key.mk new file +7
-0+VOLUME_KEY_LICENSE_FILES = COPYING +VOLUME_KEY_DEPENDENCIES = cryptsetup libglib2 libgpgme libnss $(TARGET_NLS_DEPENDENCIES) +VOLUME_KEY_INSTALL_STAGING = YES +VOLUME_KEY_AUTORECONF = YES +VOLUME_KEY_GETTEXTIZE = YES + +VOLUME_KEY_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \
The --with-sysroot option always looks weird. What is this needed for ?
package/volume_key/volume_key.mk line 22
Quoted 5 lines
package/volume_key/volume_key.mk new file +5
-0+ --with-gpgme-prefix=$(STAGING_DIR)/usr \ + --without-python \ + --without-python3 + +$(eval $(autotools-package))
In the configure.ac file, I see:
AC_PATH_PROG([GPG], [gpg2])AC_ARG_VAR([GPG])AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable])
So don't we need gnupg on the host for this to work ?
I see:
PKG_CHECK_MODULES(blkid, [blkid])
don't we need the blkid library from util-linux ? I see it is selected by cryptsetup, which is why it works.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/4 package/volume_key: add new package
Hi Thomas,
Quoted 5 lines · Thomas Petazzoni
Hello,
On Mon, 17 Feb 2020 15:30:28 +0100
Giulio Benetti <[email protected]> wrote:
Quoted 11 lines
DEVELOPERS F: package/minicom/ · line 1019
Quoted 9 lines
DEVELOPERS +1
-0@@ -1016,6 +1016,7 @@ F: package/minicom/ F: package/nfs-utils/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/volume_key/Would you mind naming the package volume-key instead of
volume_key?
Sure
Quoted 10 lines
Quoted 10 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +4
-0@@ -0,0 +1,28 @@ +From d1142e667f4f2f2fcd2d36a006919325c1a4377e Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Sat, 25 Jan 2020 17:24:38 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in entry from
Quoted 8 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch line 10
Quoted 6 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +6
-0+ AC_CONFIG_FILES + +AC_CONFIG_FILES should not contain po/Makefile.in file because +gettextize will re-add it again causing build failure. + +Signed-off-by: Giulio Benetti <[email protected]>Was this reported upstream?
Not this patch, because the issue happens only when gettextizing, and if instead you build without getextizing it fails. So I don't think upstream will be interested about it, what do you think? This was a doubt I had while dealing with this.
Quoted 19 lines
Quoted 19 lines
package/volume_key/Config.in new file +13
-0@@ -0,0 +1,19 @@ +config BR2_PACKAGE_VOLUME_KEY + bool "volume_key" + depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup, libassuan, libglib2, libgpgme, libnss + depends on BR2_USE_MMU # cryptsetup, libassuan, libglib2, libgpgme + depends on !BR2_STATIC_LIBS # cryptsetup, libnss + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libassuan + select BR2_PACKAGE_CRYPTSETUP + select BR2_PACKAGE_LIBASSUAN + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LIBNSS
Quoted 8 lines
package/volume_key/Config.in line 19
Quoted 6 lines
package/volume_key/Config.in new file +6
-0+ help + The volume_key project provides a libvolume_key, a library for manipulating + storage volume encryption keys and storing them separately from volumes, and an + associated command-line tool, named volume_key. + + https://pagure.io/volume_keyYou need a Config.in comment about the (numerous) dependencies.
Oh yes,completely forgotten!
Quoted 7 lines
Quoted 7 lines
package/volume_key/volume_key.mk new file +1
-0@@ -0,0 +1,22 @@ +################################################################################
Quoted 8 lines
package/volume_key/volume_key.mk line 7
Quoted 6 lines
package/volume_key/volume_key.mk new file +6
-0+# +# volume_key +# +################################################################################ + +VOLUME_KEY_VERSION = f56614199726ba1897d8687f0927535693b6603fWhy not use the 0.3.12 release ?
Right
Quoted 5 lines
package/volume_key/volume_key.mk line 10
Quoted 3 lines
package/volume_key/volume_key.mk new file +3
-0+VOLUME_KEY_SITE = https://pagure.io/volume_key.git +VOLUME_KEY_SITE_METHOD = git +VOLUME_KEY_LICENSE = GPL-2.0+I don't see the "or later" option in any of the source files, so shouldn't this be GPL-2.0 ?
Right
Quoted 9 lines
package/volume_key/volume_key.mk line 17
Quoted 7 lines
package/volume_key/volume_key.mk new file +7
-0+VOLUME_KEY_LICENSE_FILES = COPYING +VOLUME_KEY_DEPENDENCIES = cryptsetup libglib2 libgpgme libnss $(TARGET_NLS_DEPENDENCIES) +VOLUME_KEY_INSTALL_STAGING = YES +VOLUME_KEY_AUTORECONF = YES +VOLUME_KEY_GETTEXTIZE = YES + +VOLUME_KEY_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \The --with-sysroot option always looks weird. What is this needed for ?
This is a mistake, it's been left there after several tries. Sorry.
Quoted 8 lines
package/volume_key/volume_key.mk line 22
Quoted 5 lines
package/volume_key/volume_key.mk new file +5
-0+ --with-gpgme-prefix=$(STAGING_DIR)/usr \ + --without-python \ + --without-python3 + +$(eval $(autotools-package))In the configure.ac file, I see:
Quoted 5 lines
AC_PATH_PROG([GPG], [gpg2])AC_ARG_VAR([GPG])AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable])So don't we need gnupg on the host for this to work ?
Yes, host-gnupg2, I've missed it since my distro provides it.
Quoted 6 lines
I see:
PKG_CHECK_MODULES(blkid, [blkid])don't we need the blkid library from util-linux ? I see it is selected by cryptsetup, which is why it works.
Yes, but if cryptsetup already selects it, do I need to repeat it in volume-key dependencies?
Best regards
Signature · 2 lines
Giulio Benetti Benetti Engineering sas
PATCH 2/4 package/volume_key: add new package
Quoted 122 lines · Giulio Benetti
Hi Thomas,
Quoted 5 lines · Thomas Petazzoni
Hello,
On Mon, 17 Feb 2020 15:30:28 +0100
Giulio Benetti <[email protected]> wrote:Quoted 11 lines
DEVELOPERS F: package/minicom/ · line 1019
Quoted 9 lines
DEVELOPERS +1
-0@@ -1016,6 +1016,7 @@ F: package/minicom/ F: package/nfs-utils/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ +F: package/volume_key/Would you mind naming the package volume-key instead of
volume_key?Sure
Quoted 10 lines
Quoted 10 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +4
-0@@ -0,0 +1,28 @@ +From d1142e667f4f2f2fcd2d36a006919325c1a4377e Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Sat, 25 Jan 2020 17:24:38 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in entry fromQuoted 8 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch line 10
Quoted 6 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +6
-0+ AC_CONFIG_FILES + +AC_CONFIG_FILES should not contain po/Makefile.in file because +gettextize will re-add it again causing build failure. + +Signed-off-by: Giulio Benetti <[email protected]>Was this reported upstream?
Not this patch, because the issue happens only when gettextizing, and if instead you build without getextizing it fails. So I don't think upstream will be interested about it, what do you think? This was a doubt I had while dealing with this.
Quoted 19 lines
Quoted 19 lines
package/volume_key/Config.in new file +13
-0@@ -0,0 +1,19 @@ +config BR2_PACKAGE_VOLUME_KEY + bool "volume_key" + depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup, libassuan, libglib2, libgpgme, libnss + depends on BR2_USE_MMU # cryptsetup, libassuan, libglib2, libgpgme + depends on !BR2_STATIC_LIBS # cryptsetup, libnss + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libassuan + select BR2_PACKAGE_CRYPTSETUP + select BR2_PACKAGE_LIBASSUAN + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_LIBNSSQuoted 8 lines
package/volume_key/Config.in line 19
Quoted 6 lines
package/volume_key/Config.in new file +6
-0+ help + The volume_key project provides a libvolume_key, a library for manipulating + storage volume encryption keys and storing them separately from volumes, and an + associated command-line tool, named volume_key. + + https://pagure.io/volume_keyYou need a Config.in comment about the (numerous) dependencies.
Oh yes,completely forgotten!
Quoted 7 lines
Quoted 7 lines
package/volume_key/volume_key.mk new file +1
-0@@ -0,0 +1,22 @@ +################################################################################Quoted 8 lines
package/volume_key/volume_key.mk line 7
Quoted 6 lines
package/volume_key/volume_key.mk new file +6
-0+# +# volume_key +# +################################################################################ + +VOLUME_KEY_VERSION = f56614199726ba1897d8687f0927535693b6603fWhy not use the 0.3.12 release ?
Right
Quoted 5 lines
package/volume_key/volume_key.mk line 10
Quoted 3 lines
package/volume_key/volume_key.mk new file +3
-0+VOLUME_KEY_SITE = https://pagure.io/volume_key.git +VOLUME_KEY_SITE_METHOD = git +VOLUME_KEY_LICENSE = GPL-2.0+I don't see the "or later" option in any of the source files, so shouldn't this be GPL-2.0 ?
Right
Quoted 9 lines
package/volume_key/volume_key.mk line 17
Quoted 7 lines
package/volume_key/volume_key.mk new file +7
-0+VOLUME_KEY_LICENSE_FILES = COPYING +VOLUME_KEY_DEPENDENCIES = cryptsetup libglib2 libgpgme libnss $(TARGET_NLS_DEPENDENCIES) +VOLUME_KEY_INSTALL_STAGING = YES +VOLUME_KEY_AUTORECONF = YES +VOLUME_KEY_GETTEXTIZE = YES + +VOLUME_KEY_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \The --with-sysroot option always looks weird. What is this needed for ?
This is a mistake, it's been left there after several tries. Sorry.
Quoted 8 lines
package/volume_key/volume_key.mk line 22
Quoted 5 lines
package/volume_key/volume_key.mk new file +5
-0+ --with-gpgme-prefix=$(STAGING_DIR)/usr \ + --without-python \ + --without-python3 + +$(eval $(autotools-package))In the configure.ac file, I see:
Quoted 7 lines
Quoted 5 lines
AC_PATH_PROG([GPG], [gpg2])AC_ARG_VAR([GPG])AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable])So don't we need gnupg on the host for this to work ?
Yes, host-gnupg2, I've missed it since my distro provides it.
I've retried building, gnupg2 only is supported but it's not mandatory to build. So as I can understand we can avoid adding host-gnupg2.
Quoted 4 lines
Quoted 4 lines
I see:
PKG_CHECK_MODULES(blkid, [blkid])
Quoted 8 lines
Quoted 2 lines
don't we need the blkid library from util-linux ? I see it is selected by cryptsetup, which is why it works.
Yes, but if cryptsetup already selects it, do I need to repeat it in volume-key dependencies?
Best regards
Best regards
Signature · 2 lines
Giulio Benetti Benetti Engineering sas
PATCH 2/4 package/volume_key: add new package
Quoted 10 lines · On Tue, 18 Feb 2020 15:06:47 +0100 Giulio Benetti…
Quoted 7 lines
Quoted 5 lines
AC_PATH_PROG([GPG], [gpg2])AC_ARG_VAR([GPG])AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable])So don't we need gnupg on the host for this to work ?
Yes, host-gnupg2, I've missed it since my distro provides it.
I've retried building, gnupg2 only is supported but it's not mandatory to build. So as I can understand we can avoid adding host-gnupg2.
Weird, I thought AC_PATH_PROG() was aborting if the tool was not found. If that's not the case, then we should ensure the build never uses gpg2, even if available, so that the build result doesn't depend on whether gpg2 is available system-wide or not.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/4 package/volume_key: add new package
Quoted 11 lines · Thomas Petazzoni
Quoted 8 lines · On Tue, 18 Feb 2020 15:06:47 +0100 Giulio Benetti…
Quoted 7 lines
Quoted 5 lines
AC_PATH_PROG([GPG], [gpg2])AC_ARG_VAR([GPG])AC_DEFINE_UNQUOTED([GPG_PATH], "$GPG", [Path to the gpg2 executable])So don't we need gnupg on the host for this to work ?
Yes, host-gnupg2, I've missed it since my distro provides it.
Quoted 7 lines
Quoted 2 lines
I've retried building, gnupg2 only is supported but it's not mandatory to build. So as I can understand we can avoid adding host-gnupg2.
Weird, I thought
AC_PATH_PROG()was aborting if the tool was not found. If that's not the case, then we should ensure the build never uses gpg2, even if available, so that the build result doesn't depend on whether gpg2 is available system-wide or not.
I went deeper in the volume_key code and found that gnupg2 is needed at runtime to create packet with passphrase, so even if build doesn't fail gnupg2 is needed at runtime. In gcr packet is the same.
But then, it turns out that gnupg2's binary name is gpg and not gpg2, but usually gpg2 name is used(i.e. on Ubuntu 19.10). Also in gcr package they assume its name is gpg2 but if you try to build you find gpg. Gnupg2 failure is difficult to find since it's at runtime(i.e. gpgme calls /usr/bin/gpg2 to encrypt/decrypt something).
So what do you suggest? Better change gpg binary file name to gpg2 or better fix gcr package to use /usr/bin/gpg instead of /usr/bin/gpg2 And do the same here with volume-key?
Gcr package is wrong in any case at the moment, so it must be fixed, and find someone who's able to test it.
Best regards
Signature · 2 lines
Giulio Benetti Benetti Engineering sas
PATCH 2/4 package/volume_key: add new package
In reply to Giulio BenettiHello,
Quoted 19 lines · On Tue, 18 Feb 2020 14:46:17 +0100 Giulio Benetti…
Quoted 10 lines
Quoted 10 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +4
-0@@ -0,0 +1,28 @@ +From d1142e667f4f2f2fcd2d36a006919325c1a4377e Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Sat, 25 Jan 2020 17:24:38 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in entry fromQuoted 8 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch line 10
Quoted 6 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +6
-0+ AC_CONFIG_FILES + +AC_CONFIG_FILES should not contain po/Makefile.in file because +gettextize will re-add it again causing build failure. + +Signed-off-by: Giulio Benetti <[email protected]>Was this reported upstream?
Quoted 4 lines
Not this patch, because the issue happens only when gettextizing, and if instead you build without getextizing it fails. So I don't think upstream will be interested about it, what do you think? This was a doubt I had while dealing with this.
Well, it is a problem if one can't autoreconf/gettextize the upstream project as-is, no?
Quoted 9 lines
Quoted 6 lines
I see:
PKG_CHECK_MODULES(blkid, [blkid])don't we need the blkid library from util-linux ? I see it is selected by cryptsetup, which is why it works.
Yes, but if cryptsetup already selects it, do I need to repeat it in volume-key dependencies?
I think since the configure.ac explicitly checks it, it makes sense to not rely on the fact that a dependency by chance also uses it.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 2/4 package/volume_key: add new package
Quoted 24 lines · Thomas Petazzoni
Hello,
Quoted 19 lines · On Tue, 18 Feb 2020 14:46:17 +0100 Giulio Benetti…
Quoted 18 lines
Quoted 6 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +0
-0package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch line 10
Quoted 10 lines
package/volume_key/0001-configure.ac-remove-po-Makefile.in-entry-from-AC_CON.patch new file +10
-0@@ -0,0 +1,28 @@ +From d1142e667f4f2f2fcd2d36a006919325c1a4377e Mon Sep 17 00:00:00 2001 +From: Giulio Benetti <[email protected]> +Date: Sat, 25 Jan 2020 17:24:38 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in entry from + AC_CONFIG_FILES + +AC_CONFIG_FILES should not contain po/Makefile.in file because +gettextize will re-add it again causing build failure. + +Signed-off-by: Giulio Benetti <[email protected]>Was this reported upstream?
Quoted 7 lines
Quoted 4 lines
Not this patch, because the issue happens only when gettextizing, and if instead you build without getextizing it fails. So I don't think upstream will be interested about it, what do you think? This was a doubt I had while dealing with this.
Well, it is a problem if one can't autoreconf/gettextize the upstream project as-is, no?
Yes, so let's keep it locally.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
I see:
PKG_CHECK_MODULES(blkid, [blkid])
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
don't we need the blkid library from util-linux ? I see it is selected by cryptsetup, which is why it works.
Yes, but if cryptsetup already selects it, do I need to repeat it in volume-key dependencies?
I think since the configure.ac explicitly checks it, it makes sense to not rely on the fact that a dependency by chance also uses it.
Ok then, it is the first time I add a package with so many dependencies.
Thank you
Best regards
Signature · 2 lines
Giulio Benetti Benetti Engineering sas
PATCH 3/4 package/libblockdev: add new package
In reply to Giulio BenettiLibblockdev is a library for manipulating block devices.
--- DEVELOPERS | 1 + package/Config.in | 1 + package/libblockdev/Config.in | 22 +++++++++++++++ package/libblockdev/libblockdev.hash | 3 +++ package/libblockdev/libblockdev.mk | 40 ++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 package/libblockdev/Config.in create mode 100644 package/libblockdev/libblockdev.hash create mode 100644 package/libblockdev/libblockdev.mk
DEVELOPERS +1 -0
@@ -1009,6 +1009,7 @@ F: package/xapian/ N: Giulio Benetti <[email protected]> F: package/at/ +F: package/libblockdev/ F: package/libbytesize/ F: package/libnspr/ F: package/libnss/
package/Config.in +1 -0
@@ -1456,6 +1456,7 @@ menu "Hardware handling" source "package/let-me-create/Config.in" source "package/libaio/Config.in" source "package/libatasmart/Config.in" + source "package/libblockdev/Config.in" source "package/libcec/Config.in" source "package/libfreefare/Config.in" source "package/libftdi/Config.in"
package/libblockdev/Config.in new file +22 -0
@@ -0,0 +1,22 @@ +config BR2_PACKAGE_LIBBLOCKDEV + bool "libblockdev" + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HAS_THREADS # volume_key -> cryptsetup + depends on BR2_USE_MMU # lvm2, volume_key -> cryptsetup + depends on !BR2_STATIC_LIBS # volume_key -> cryptsetup + depends on BR2_SYSTEM_ENABLE_NLS # volume_key + select BR2_PACKAGE_LIBBYTESIZE + select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_PARTED + select BR2_PACKAGE_VOLUME_KEY + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_UTIL_LINUX + help + libblockdev is a C library supporting GObject introspection for + manipulation of block devices + + https://github.com/storaged-project/libblockdev/ + +comment "libblockdev needs udev /dev management and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV
package/libblockdev/libblockdev.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally calculated +sha256 c5fc030474b44afcaedd8ea10388282534a6d5bb25488b780e645fbf0a6d4d80 libblockdev-2.23-1.tar.gz +sha256 97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946 LICENSE
package/libblockdev/libblockdev.mk new file +40 -0
@@ -0,0 +1,40 @@ +################################################################################ +# +# libblockdev +# +################################################################################ + +LIBBLOCKDEV_VERSION = 2.23-1 +LIBBLOCKDEV_SITE = $(call github,storaged-project,libblockdev,$(LIBBLOCKDEV_VERSION)) +LIBBLOCKDEV_LICENSE = LGPL-2.1+ +LIBBLOCKDEV_LICENSE_FILES = LICENSE +LIBBLOCKDEV_DEPENDENCIES = host-autoconf-archive host-pkgconf kmod \ + libbytesize libyaml parted udev util-linux \ + volume_key +LIBBLOCKDEV_INSTALL_STAGING = YES +LIBBLOCKDEV_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive +LIBBLOCKDEV_AUTORECONF = YES + +LIBBLOCKDEV_CONF_OPTS = --without-nvdimm + +ifeq ($(BR2_PACKAGE_DMRAID),y) +LIBBLOCKDEV_CONF_OPTS += --with-dmraid +LIBBLOCKDEV_DEPENDENCIES += dmraid +else +LIBBLOCKDEV_CONF_OPTS += --without-dmraid +endif + +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBBLOCKDEV_CONF_OPTS += --enable-introspection=yes +LIBBLOCKDEV_DEPENDENCIES += gobject-introspection +else +LIBBLOCKDEV_CONF_OPTS += --enable-introspection=no +endif + +# Autoreconf requires an existing m4 directory +define LIBBLOCKDEV_MKDIR_M4 + mkdir -p $(@D)/m4 +endef +LIBBLOCKDEV_POST_PATCH_HOOKS += LIBBLOCKDEV_MKDIR_M4 + +$(eval $(autotools-package))
Signature · 1 line
2.20.1
PATCH 3/4 package/libblockdev: add new package
Hello,
package/libblockdev/Config.in line 6
Quoted 12 lines · On Mon, 17 Feb 2020 15:30:29 +0100 Giulio Benetti…
package/libblockdev/Config.in new file +6
-0@@ -0,0 +1,22 @@ +config BR2_PACKAGE_LIBBLOCKDEV + bool "libblockdev" + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_TOOLCHAIN_HAS_THREADS # volume_key -> cryptsetup + depends on BR2_USE_MMU # lvm2, volume_key -> cryptsetup + depends on !BR2_STATIC_LIBS # volume_key -> cryptsetup
You're missing a few dependencies from volume-key:
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup
+ depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libassuan
+ depends on BR2_USE_WCHAR # libglib2
Could you double check ?
package/libblockdev/Config.in line 7
Quoted 1 line
package/libblockdev/Config.in new file +1
-0+ depends on BR2_SYSTEM_ENABLE_NLS # volume_key
There is no such dependency in volume-key.
package/libblockdev/Config.in line 10
Quoted 3 lines
package/libblockdev/Config.in new file +3
-0+ select BR2_PACKAGE_LIBBYTESIZE + select BR2_PACKAGE_LIBYAML + select BR2_PACKAGE_PARTED
This one depends on BR2_ENABLE_LOCALE
package/libblockdev/Config.in line 13
Quoted 3 lines
package/libblockdev/Config.in new file +3
-0+ select BR2_PACKAGE_VOLUME_KEY + select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT + select BR2_PACKAGE_UTIL_LINUX
Reverse the order of those last two lines.
package/libblockdev/Config.in line 22
Quoted 9 lines
package/libblockdev/Config.in new file +9
-0+ help + libblockdev is a C library supporting GObject introspection for + manipulation of block devices + + https://github.com/storaged-project/libblockdev/ + +comment "libblockdev needs udev /dev management and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV
This is not accurate considering the dependencies of BR2_PACKAGE_LIBBLOCKDEV.
package/libblockdev/Config.in
Quoted 7 lines
package/libblockdev/Config.in new file +7
-0+LIBBLOCKDEV_VERSION = 2.23-1 +LIBBLOCKDEV_SITE = $(call github,storaged-project,libblockdev,$(LIBBLOCKDEV_VERSION)) +LIBBLOCKDEV_LICENSE = LGPL-2.1+ +LIBBLOCKDEV_LICENSE_FILES = LICENSE +LIBBLOCKDEV_DEPENDENCIES = host-autoconf-archive host-pkgconf kmod \ + libbytesize libyaml parted udev util-linux \ + volume_key
kmod is used here, but not selected by the Config.in file. Indentation is also odd: you should have only one tab to indent the continuation lines.
package/libblockdev/Config.in
Quoted 2 lines
package/libblockdev/Config.in new file +2
-0+LIBBLOCKDEV_INSTALL_STAGING = YES +LIBBLOCKDEV_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive
I haven't followed the recent autoreconf rework, is this now the right way of using autoconf-archive macros ?
package/libblockdev/Config.in
Quoted 6 lines
package/libblockdev/Config.in new file +6
-0+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBBLOCKDEV_CONF_OPTS += --enable-introspection=yes +LIBBLOCKDEV_DEPENDENCIES += gobject-introspection +else +LIBBLOCKDEV_CONF_OPTS += --enable-introspection=no +endif
We don't have GOI support (yet).
package/libblockdev/Config.in
Quoted 5 lines
package/libblockdev/Config.in new file +5
-0+# Autoreconf requires an existing m4 directory +define LIBBLOCKDEV_MKDIR_M4 + mkdir -p $(@D)/m4 +endef +LIBBLOCKDEV_POST_PATCH_HOOKS += LIBBLOCKDEV_MKDIR_M4
So the change from Michael Walle that allows to drop this was not merged yet?
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 4/4 package/udisks: bump version to 2.8.4
In reply to Giulio BenettiBump to version 2.8.4 of udisks. All patches have been upstremed, so drop them all.
--- DEVELOPERS | 1 + ...-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 | 31 ++++--- package/udisks/udisks.hash | 4 +- package/udisks/udisks.mk | 23 ++++-- 7 files changed, 38 insertions(+), 164 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
DEVELOPERS +1 -0
@@ -1018,6 +1018,7 @@ F: package/nfs-utils/ F: package/sunxi-mali-mainline/ F: package/sunxi-mali-mainline-driver/ F: package/volume_key/ +F: package/udisks/ N: Gregory Dymarek <[email protected]> F: package/ding-libs/
package/udisks/0001-fix-build-with-newer-glibc-versions.patch deleted +0 -29
@@ -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 <[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
package/udisks/0002-Fix-systemd-service-file.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From bf8b4362cef24a6f747e4329305a4939c8f585d1 Mon Sep 17 00:00:00 2001 -From: David King <[email protected]> -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 <[email protected]> ---- - 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 -
package/udisks/0003-Fix-compilation-issue-with-missing-sys-sysmacros.h-i.patch deleted +0 -81
81 lines not on this page · raw message
package/udisks/Config.in +19 -12
@@ -4,21 +4,27 @@ config BR2_PACKAGE_UDISKS 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_HOST_QEMU_ARCH_SUPPORTS # gobject-introspection depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey + depends on BR2_SYSTEM_ENABLE_NLS # volume_key + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey, gobject-introspection depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit - depends on BR2_USE_MMU # lvm2 + depends on BR2_USE_MMU # lvm2, gobject-introspection 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_USES_GLIBC select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_SG3_UTILS - select BR2_PACKAGE_POLKIT - select BR2_PACKAGE_PARTED - select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBATASMART + select BR2_PACKAGE_LIBBLOCKDEV select BR2_PACKAGE_LIBGUDEV + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_PARTED + select BR2_PACKAGE_POLKIT + select BR2_PACKAGE_SG3_UTILS + select BR2_PACKAGE_LIBXSLT help The udisks project provides
@@ -36,24 +42,25 @@ if BR2_PACKAGE_UDISKS config BR2_PACKAGE_UDISKS_LVM2 bool "lvm2 support" # The lvm app library can't compile against musl - depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LVM2_APP_LIBRARY help Enable LVM2 support -comment "lvm2 support needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC - endif comment "udisks needs udev /dev management" depends on BR2_USE_MMU depends on !BR2_PACKAGE_HAS_UDEV -comment "udisks needs a glibc or musl toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" +comment "udisks support needs NLS enabled" + depends on !BR2_SYSTEM_ENABLE_NLS + +comment "udisks needs a glibc toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS - depends on !BR2_ENABLE_LOCALE || BR2_TOOLCHAIN_USES_UCLIBC || \ + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on !BR2_ENABLE_LOCALE || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_INSTALL_LIBSTDCPP || \ BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
package/udisks/udisks.hash +2 -2
@@ -1,3 +1,3 @@ # Locally calculated -sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz -sha256 7d30f41a79a9b453b4972a6d7e3425ff104b39232891bde8ba659f1adb21f771 COPYING +sha256 d28367bdacfa039719327e68300b6118427874f2dc53ff7109dedb70a7289819 udisks-2.8.4.tar.bz2 +sha256 98046e932dc6c739001e79d7079a3bd958fc55475dcd917d27f884c0c93525cc COPYING
package/udisks/udisks.mk +16 -7
@@ -4,28 +4,37 @@ # ################################################################################ -UDISKS_VERSION = 1.0.5 -UDISKS_SITE = http://hal.freedesktop.org/releases +UDISKS_VERSION = 2.8.4 +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-autoconf-archive \ host-pkgconf \ + host-gettext \ udev \ dbus \ dbus-glib \ polkit \ parted \ - lvm2 \ libatasmart \ - libgudev + libgudev \ + libblockdev \ + libxslt -UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages +UDISKS_CONF_OPTS = \ + --disable-remote-access \ + --disable-man \ + --disable-btrfs \ + --disable-iscsi \ + --disable-lsm \ + --disable-zram ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) +UDISKS_DEPENDENCIES += lvm2 UDISKS_CONF_OPTS += --enable-lvm2 endif
Signature · 1 line
2.20.1
PATCH 4/4 package/udisks: bump version to 2.8.4
Quoted 2 lines · On Mon, 17 Feb 2020 15:30:30 +0100 Giulio Benetti…
Bump to version 2.8.4 of udisks. All patches have been upstremed, so drop them all.
Considering the complexity of the bump, it would be nice to have more details in the commit log.
package/udisks/Config.in config BR2_PACKAGE_UDISKS · line 9
Quoted 12 lines
package/udisks/Config.in +2
-1@@ -4,21 +4,27 @@ config BR2_PACKAGE_UDISKS 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_HOST_QEMU_ARCH_SUPPORTS # gobject-introspection depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS # spidermonkey - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey + depends on BR2_SYSTEM_ENABLE_NLS # volume_key
There is no such dependency in volume_key.
package/udisks/Config.in config BR2_PACKAGE_UDISKS · line 16
Quoted 8 lines
package/udisks/Config.in +3
-1+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # spidermonkey, gobject-introspection depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # polkit - depends on BR2_USE_MMU # lvm2 + depends on BR2_USE_MMU # lvm2, gobject-introspection 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_USES_GLIBC
Why is this dependency on glibc needed? Coming from GOI ? Also, it makes the !BR2_TOOLCHAIN_USES_UCLIBC dependency no longer needed.
In addition, you did not propagate all the dependencies of volume_key I believe (such as SYNC_4). Could you check this ?
Quoted 5 lines
package/udisks/Config.in +0
-3select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_SG3_UTILS - select BR2_PACKAGE_POLKIT - select BR2_PACKAGE_PARTED
package/udisks/Config.in config BR2_PACKAGE_UDISKS · line 27
Quoted 10 lines
package/udisks/Config.in +7
-1- select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_GOBJECT_INTROSPECTION select BR2_PACKAGE_LIBATASMART + select BR2_PACKAGE_LIBBLOCKDEV select BR2_PACKAGE_LIBGUDEV + select BR2_PACKAGE_LVM2 + select BR2_PACKAGE_PARTED + select BR2_PACKAGE_POLKIT + select BR2_PACKAGE_SG3_UTILS + select BR2_PACKAGE_LIBXSLT
Alphabetic ordering would be nice.
package/udisks/Config.in if BR2_PACKAGE_UDISKS · line 56
Quoted 3 lines
package/udisks/Config.in +2
-1-comment "udisks needs a glibc or musl toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" +comment "udisks support needs NLS enabled" + depends on !BR2_SYSTEM_ENABLE_NLS
As said above, I don't think that it is true.
package/udisks/Config.in if BR2_PACKAGE_UDISKS · line 66
Quoted 10 lines
package/udisks/Config.in +4
-1+comment "udisks needs a glibc toolchain with locale, C++, wchar, dynamic library, NPTL, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS - depends on !BR2_ENABLE_LOCALE || BR2_TOOLCHAIN_USES_UCLIBC || \ + depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS + depends on !BR2_ENABLE_LOCALE || \ + !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_INSTALL_LIBSTDCPP || \ BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
Of course, this will have to be updated.
Overall, it is really crazy. A stupid daemon that manages storage devices need a Javascript interpreter and GOI.
There was some discussion at
https://github.com/storaged-project/udisks/issues/615 about running udisks without polkit.
Or maybe we need to package https://wiki.gentoo.org/wiki/Udevil as an alternative, but it's not maintained since 2015, so not great at all. See https://github.com/IgnorantGuru/udevil/commits/master.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com