[Buildroot] [PATCH 1/1] package/open-iscsi: open-isns is optional, not mandatory

[Buildroot] [PATCH 1/1] package/open-iscsi: open-isns is optional, not mandatory

[Fabrice Fontaine]

open-isns is optional, not mandatory, since bump to version 2.1.9 in
commit 2314928cf828ff02939b9c0041964c3ee2dd907d and
https://github.com/open-iscsi/open-iscsi/commit/713524df809396e11f42d7691bd8ead2ffc1ca6b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/open-iscsi/Config.in     | 1 -
 package/open-iscsi/open-iscsi.mk | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in
index e55bbfd867..01d83615c9 100644
--- a/package/open-iscsi/Config.in
+++ b/package/open-iscsi/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_OPEN_ISCSI
 	depends on !BR2_STATIC_LIBS # kmod
 	select BR2_PACKAGE_KMOD
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_OPEN_ISNS
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	help
diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk
index d1f40d3e20..1266db3d3f 100644
--- a/package/open-iscsi/open-iscsi.mk
+++ b/package/open-iscsi/open-iscsi.mk
@@ -9,10 +9,17 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION))
 OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+
 OPEN_ISCSI_LICENSE_FILES = COPYING README libopeniscsiusr/COPYING
 OPEN_ISCSI_CPE_ID_VALID = YES
-OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux
+OPEN_ISCSI_DEPENDENCIES = kmod openssl util-linux
 
 OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi
 
+ifeq ($(BR2_PACKAGE_OPEN_ISNS),y)
+OPEN_ISCSI_DEPENDENCIES += open-isns
+OPEN_ISCSI_CONF_OPTS += -Disns=enabled
+else
+OPEN_ISCSI_CONF_OPTS += -Disns=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 OPEN_ISCSI_DEPENDENCIES += systemd
 OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/open-iscsi: open-isns is optional, not mandatory

[Thomas Petazzoni via buildroot]

On Sat, 27 Jul 2024 18:57:15 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> open-isns is optional, not mandatory, since bump to version 2.1.9 in
> commit 2314928cf828ff02939b9c0041964c3ee2dd907d and
> https://github.com/open-iscsi/open-iscsi/commit/713524df809396e11f42d7691bd8ead2ffc1ca6b
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/open-iscsi/Config.in     | 1 -
>  package/open-iscsi/open-iscsi.mk | 9 ++++++++-
>  2 files changed, 8 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/open-iscsi: open-isns is optional, not mandatory

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > open-isns is optional, not mandatory, since bump to version 2.1.9 in
 > commit 2314928cf828ff02939b9c0041964c3ee2dd907d and
 > https://github.com/open-iscsi/open-iscsi/commit/713524df809396e11f42d7691bd8ead2ffc1ca6b

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2024.02.x and 2024.05.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot