Selaa lähdekoodia

package/open-iscsi: open-isns is optional, not mandatory

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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 1 vuosi sitten
vanhempi
commit
948b183042
2 muutettua tiedostoa jossa 8 lisäystä ja 2 poistoa
  1. 0 1
      package/open-iscsi/Config.in
  2. 8 1
      package/open-iscsi/open-iscsi.mk

+ 0 - 1
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

+ 8 - 1
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