From patchwork Sun May 13 19:07:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 912561 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40kYJ90mqWz9s0w for ; Mon, 14 May 2018 05:08:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C857025445; Sun, 13 May 2018 19:08:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 342Pz7OAne5o; Sun, 13 May 2018 19:08:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 52D2C25379; Sun, 13 May 2018 19:08:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2D9D91C44AF for ; Sun, 13 May 2018 19:08:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2AF2124F8D for ; Sun, 13 May 2018 19:08:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f0FRFzxwJEwf for ; Sun, 13 May 2018 19:07:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by silver.osuosl.org (Postfix) with ESMTP id 955402530B for ; Sun, 13 May 2018 19:07:59 +0000 (UTC) Received: by mail.bootlin.com (Postfix, from userid 110) id 5BD8D208B2; Sun, 13 May 2018 21:07:57 +0200 (CEST) Received: from localhost (LFbn-TOU-1-408-85.w86-206.abo.wanadoo.fr [86.206.234.85]) by mail.bootlin.com (Postfix) with ESMTPSA id 2F419206F6; Sun, 13 May 2018 21:07:57 +0200 (CEST) From: Thomas Petazzoni To: Buildroot List Date: Sun, 13 May 2018 21:07:33 +0200 Message-Id: <20180513190737.26079-5-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180513190737.26079-1-thomas.petazzoni@bootlin.com> References: <20180513190737.26079-1-thomas.petazzoni@bootlin.com> Subject: [Buildroot] [PATCH 4/8] ipsec-tools: rename options to have proper prefix X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Ricardo Martincoski MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 Acked-by: "Yann E. MORIN" --- Config.in.legacy | 24 ++++++++++++++++++++++++ package/ipsec-tools/Config.in | 8 ++++---- package/ipsec-tools/ipsec-tools.mk | 6 +++--- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 72563031ce..314e0578d8 100644 --- a/Config.in.legacy +++ b/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 diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in index 1635675a36..59154123e6 100644 --- a/package/ipsec-tools/Config.in +++ b/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 diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index c0b180de55..ddae9a75f3 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/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