diff mbox series

[1/1] package/libblockdev: bump to version 3.2.0

Message ID 20240910183103.2837260-1-james.hilliard1@gmail.com
State Accepted
Headers show
Series [1/1] package/libblockdev: bump to version 3.2.0 | expand

Commit Message

James Hilliard Sept. 10, 2024, 6:31 p.m. UTC 
Add new smart and smartmontools config options.

Add new libyaml dependency to lvm config option.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/libblockdev/Config.in        | 20 ++++++++++++++++++++
 package/libblockdev/libblockdev.hash |  2 +-
 package/libblockdev/libblockdev.mk   | 20 +++++++++++++++++---
 3 files changed, 38 insertions(+), 4 deletions(-)

Comments

Thomas Petazzoni Sept. 14, 2024, 8:14 p.m. UTC | #1 
Hello James,

On Tue, 10 Sep 2024 12:31:03 -0600
James Hilliard <james.hilliard1@gmail.com> wrote:

> +config BR2_PACKAGE_LIBBLOCKDEV_SMARTMONTOOLS
> +	bool "smartmontools"
> +	depends on BR2_INSTALL_LIBSTDCPP # smartmontools
> +	depends on BR2_USE_MMU # smartmontools
> +	select BR2_PACKAGE_JSON_GLIB
> +	select BR2_PACKAGE_SMARTMONTOOLS # runtime
> +
> +comment "smartmontools needs a toolchain w/ C++"
> +	depends on BR2_USE_MMU
> +	depends on !BR2_PACKAGE_HAS_UDEV

This last line should have been:

	depends on !BR2_INSTALL_LIBSTDCPP

Applied with this fixed. Thanks!

Thomas
diff mbox series

Patch

diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in
index 62ecaa1ac2..dc975535d3 100644
--- a/package/libblockdev/Config.in
+++ b/package/libblockdev/Config.in
@@ -48,6 +48,7 @@  config BR2_PACKAGE_LIBBLOCKDEV_LVM2
 	depends on BR2_ENABLE_LOCALE # parted
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted
 	select BR2_PACKAGE_PARTED
+	select BR2_PACKAGE_LIBYAML
 	select BR2_PACKAGE_LVM2
 
 comment "lvm2 support needs a toolchain w/ locale, gcc >= 5"
@@ -72,6 +73,25 @@  config BR2_PACKAGE_LIBBLOCKDEV_PART
 comment "part plugin needs a toolchain w/ locale, gcc >= 5"
 	depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
+config BR2_PACKAGE_LIBBLOCKDEV_SMART
+	bool "smart"
+	depends on BR2_PACKAGE_HAS_UDEV # libatasmart
+	select BR2_PACKAGE_LIBATASMART
+
+comment "smart needs udev /dev management"
+	depends on !BR2_PACKAGE_HAS_UDEV
+
+config BR2_PACKAGE_LIBBLOCKDEV_SMARTMONTOOLS
+	bool "smartmontools"
+	depends on BR2_INSTALL_LIBSTDCPP # smartmontools
+	depends on BR2_USE_MMU # smartmontools
+	select BR2_PACKAGE_JSON_GLIB
+	select BR2_PACKAGE_SMARTMONTOOLS # runtime
+
+comment "smartmontools needs a toolchain w/ C++"
+	depends on BR2_USE_MMU
+	depends on !BR2_PACKAGE_HAS_UDEV
+
 config BR2_PACKAGE_LIBBLOCKDEV_SWAP
 	bool "swap"
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
diff --git a/package/libblockdev/libblockdev.hash b/package/libblockdev/libblockdev.hash
index 1438fad741..9cc3817870 100644
--- a/package/libblockdev/libblockdev.hash
+++ b/package/libblockdev/libblockdev.hash
@@ -1,3 +1,3 @@ 
 # Locally calculated
-sha256  a5cb33a53ff5969067982704f45399d02555fdb2313ed0c56eac9555397dc2db  libblockdev-3.1.1.tar.gz
+sha256  f2918de9ce1b54ac1aee5e5757e555947896a74674cdca9d05940a53d19e32a8  libblockdev-3.2.0.tar.gz
 sha256  97bdc721d875501b6243a456333fdfdb1ab64d31c4da2554de845caf4674b946  LICENSE
diff --git a/package/libblockdev/libblockdev.mk b/package/libblockdev/libblockdev.mk
index 9ffa15a7a9..6232f243b1 100644
--- a/package/libblockdev/libblockdev.mk
+++ b/package/libblockdev/libblockdev.mk
@@ -4,8 +4,8 @@ 
 #
 ################################################################################
 
-LIBBLOCKDEV_VERSION = 3.1.1
-LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)-1
+LIBBLOCKDEV_VERSION = 3.2.0
+LIBBLOCKDEV_SITE = https://github.com/storaged-project/libblockdev/releases/download/$(LIBBLOCKDEV_VERSION)
 LIBBLOCKDEV_LICENSE = LGPL-2.1
 LIBBLOCKDEV_LICENSE_FILES = LICENSE
 LIBBLOCKDEV_INSTALL_STAGING = YES
@@ -47,7 +47,7 @@  LIBBLOCKDEV_CONF_OPTS += --without-loop
 endif
 
 ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_LVM2),y)
-LIBBLOCKDEV_DEPENDENCIES += lvm2 parted
+LIBBLOCKDEV_DEPENDENCIES += libyaml lvm2 parted
 LIBBLOCKDEV_CONF_OPTS += --with-lvm
 else
 LIBBLOCKDEV_CONF_OPTS += --without-lvm
@@ -67,6 +67,20 @@  else
 LIBBLOCKDEV_CONF_OPTS += --without-part
 endif
 
+ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SMART),y)
+LIBBLOCKDEV_DEPENDENCIES += libatasmart
+LIBBLOCKDEV_CONF_OPTS += --with-smart
+else
+LIBBLOCKDEV_CONF_OPTS += --without-smart
+endif
+
+ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SMARTMONTOOLS),y)
+LIBBLOCKDEV_DEPENDENCIES += json-glib
+LIBBLOCKDEV_CONF_OPTS += --with-smartmontools
+else
+LIBBLOCKDEV_CONF_OPTS += --without-smartmontools
+endif
+
 ifeq ($(BR2_PACKAGE_LIBBLOCKDEV_SWAP),y)
 LIBBLOCKDEV_DEPENDENCIES += util-linux
 LIBBLOCKDEV_CONF_OPTS += --with-swap