diff --git a/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch b/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch deleted file mode 100644 index 8129c1e2a7e..00000000000 --- a/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 3aad8d471201da4125bd03d7a6921707461fe182 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Fri, 7 Jun 2024 10:06:22 +0200 -Subject: [PATCH 1/3] fs: Ignore unused-parameter warning in the FS plugin - -There are some unused parameters in the libext2fs header which -together with Wall and Werror means the plugin compilation fails. -As a workaround we'll disable the unused-parameter warning for -now. - -Fixes: #1026 - -Taken from Fedora - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - src/plugins/fs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am -index 7d4849c0..00474d5a 100644 ---- a/src/plugins/fs/Makefile.am -+++ b/src/plugins/fs/Makefile.am -@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects - - lib_LTLIBRARIES = libbd_fs.la - --libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -+libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter - libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) - libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' - libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ --- -2.45.2 - - -From da5c14f3e2f83c8c40203897154ee2b788782792 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Fri, 7 Jun 2024 15:21:09 +0200 -Subject: [PATCH 2/3] fs: Ignore shift-count-overflow warning in FS plugin - -The warning happens in the libext2fs header. ---- - src/plugins/fs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am -index 00474d5a..42e1c777 100644 ---- a/src/plugins/fs/Makefile.am -+++ b/src/plugins/fs/Makefile.am -@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects - - lib_LTLIBRARIES = libbd_fs.la - --libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -+libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow - libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) - libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' - libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ --- -2.45.2 - - -From 90ceb4b52fbda34673fe5303da84b9a902187503 Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Wed, 12 Jun 2024 15:34:02 +0200 -Subject: [PATCH 3/3] fs: Fix ignoring errors from libext2fs - -Follow-up for #1028, we still want to show the warning and not -completely supress it. ---- - src/plugins/fs/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am -index 42e1c777..1ee256f0 100644 ---- a/src/plugins/fs/Makefile.am -+++ b/src/plugins/fs/Makefile.am -@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects - - lib_LTLIBRARIES = libbd_fs.la - --libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow -+libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=shift-count-overflow - libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) - libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' - libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ --- -2.45.2 - diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.0.bb similarity index 85% rename from meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb rename to meta-oe/recipes-extended/libblockdev/libblockdev_3.2.0.bb index a42e09d3361..baf2acca5f8 100644 --- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb +++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.0.bb @@ -12,19 +12,18 @@ inherit autotools gobject-introspection pkgconfig lib_package DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" -SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \ +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=master;protocol=https \ file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ - file://0001-libext2fs-unused-parameters-fix.patch \ " -SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050" +SRCREV = "27881cb6e57eb0146c51d032ea72fbb3cd6bda7e" S = "${WORKDIR}/git" FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" -PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools" +PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools smart smartmontools" PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" -PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" +PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools libyaml, lvm2" +PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools libyaml, lvm2" PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" PACKAGECONFIG[parted] = "--with-part, --without-part, parted" PACKAGECONFIG[fs] = "--with-fs, --without-fs, e2fsprogs util-linux" @@ -36,5 +35,7 @@ PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" +PACKAGECONFIG[smart] = "--with-smart,--without-smart,libatasmart" +PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools" export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs"