Browse Source

ipsec-tools: rename options to have proper prefix

A number of options in the ipsec-tools package had their Config.in
option prefixed by BR2_PACKAGE_IPSEC, while the prefix should be
BR2_PACKAGE_IPSEC_TOOLS. This commit fixes that, and adds the
necessary Config.in.legacy handling.

Since those options are part of a choice, the legacy handling cannot
select the new name of the options, so the legacy handling only
informs the user of the rename.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni 7 years ago
parent
commit
9d2c5c2540
3 changed files with 31 additions and 7 deletions
  1. 24 0
      Config.in.legacy
  2. 4 4
      package/ipsec-tools/Config.in
  3. 3 3
      package/ipsec-tools/ipsec-tools.mk

+ 24 - 0
Config.in.legacy

@@ -145,6 +145,30 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2018.05"
 
+config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+	bool "ipsec-tools security context disable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_DISABLE was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE.
+
+config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
+	bool "ipsec-tools SELinux security context enable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_ENABLE was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE.
+
+config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
+	bool "ipsec-tools kernel security context enable option renamed"
+	select BR2_LEGACY
+	help
+	  For consistency reasons, the option
+	  BR2_PACKAGE_IPSEC_SECCTX_KERNEL was renamed to
+	  BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL.
+
 config BR2_PACKAGE_LIBTFDI_CPP
 	bool "libftdi C++ bindings option renamed"
 	select BR2_LEGACY

+ 4 - 4
package/ipsec-tools/Config.in

@@ -57,17 +57,17 @@ config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
 
 choice
 	prompt "Security context"
-	default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+	default BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
 	help
 	  Selects whether or not to enable security context support.
 
-config BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE
 	bool "Disable security context support"
 
-config BR2_PACKAGE_IPSEC_SECCTX_ENABLE
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE
 	bool "Enable SELinux security context support"
 
-config BR2_PACKAGE_IPSEC_SECCTX_KERNEL
+config BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL
 	bool "Enable kernel security context"
 
 endchoice

+ 3 - 3
package/ipsec-tools/ipsec-tools.mk

@@ -68,13 +68,13 @@ else
 IPSEC_TOOLS_CONF_OPTS += --disable-hybrid
 endif
 
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_DISABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
 endif
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_ENABLE),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes
 endif
-ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
+ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_SECCTX_KERNEL),y)
 IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel
 endif