libblockdev: upgrade 3.1.1 -> 3.2.0

ChangeLog: https://github.com/storaged-project/libblockdev/releases/tag/3.2.0 * Drop 0001-libext2fs-unused-parameters-fix.patch as the issue has been fixed upstream. * Add PACKAGECONFIG[smart] and PACKAGECONFIG[smartmontools]. * Add libyaml dependency for PACKAGECONFIG[lvm] and PACKAGECONFIG[lvm-dbus]. Signed-off-by: Yi Zhao <[email protected]> Signed-off-by: Khem Raj <[email protected]>
nxp-upstream · Oct 6, 2024 · 276ac2c · 276ac2c
1 parent ebaf461
commit 276ac2c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 98 deletions.
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
diff --git a/...extended/libblockdev/libblockdev_3.1.1.bb → ...extended/libblockdev/libblockdev_3.2.0.bb b/...extended/libblockdev/libblockdev_3.1.1.bb → ...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"