package/libcurl: rename curl binary config symbol

Package optional or choice config symbols are usually prefixed with the
package config symbol name. Rename BR2_PACKAGE_CURL to
BR2_PACKAGE_LIBCURL_CURL to conform.

Update references to the old name.

Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/Config.in.legacy b/Config.in.legacy
index bf69b579e3de98e7be87a1593442a809331dc00e..87966facb4dd311b078f81321a57d9ac731fcff5 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2020.02"
 
+config BR2_PACKAGE_CURL
+       bool "BR2_PACKAGE_CURL was renamed"
+       select BR2_PACKAGE_LIBCURL_CURL
+       select BR2_LEGACY
+       help
+         The BR2_PACKAGE_CURL config symbol was renamed to
+         BR2_PACKAGE_LIBCURL_CURL.
+
 config BR2_PACKAGE_GSTREAMER
        bool "gstreamer-0.10 removed"
        select BR2_LEGACY

diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt
index d10f276e83bd12c942dfe70bfa5fa65cc8ff3931..95a1d599ef74c80e7f203fe921643a15b088bbd4 100644 (file)
--- a/docs/manual/adding-packages-tips.txt
+++ b/docs/manual/adding-packages-tips.txt
@@ -98,7 +98,7 @@ config snippet. For example, here's how you would test +libcurl+ with
 ----
 $ cat libcurl.config
 BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_OPENSSL=y
 ----
 

diff --git a/package/dehydrated/Config.in b/package/dehydrated/Config.in
index f14ae0f6110c74cfa0916c4a243fbab2997d6a8e..979938d70ca6c48fc8ab5eb156f5e491546ee332 100644 (file)
--- a/package/dehydrated/Config.in
+++ b/package/dehydrated/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_DEHYDRATED
        select BR2_PACKAGE_BASH
        select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash
        select BR2_PACKAGE_LIBCURL
-       select BR2_PACKAGE_CURL
+       select BR2_PACKAGE_LIBCURL_CURL
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL
        select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL

diff --git a/package/glslsandbox-player/Config.in b/package/glslsandbox-player/Config.in
index 32239d29d0d50caf20eb625d6de1f173bd025a63..dc0d2c07f1b9ad513f2194e215934dbc29c256cc 100644 (file)
--- a/package/glslsandbox-player/Config.in
+++ b/package/glslsandbox-player/Config.in
@@ -41,7 +41,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS
        select BR2_PACKAGE_BASH # runtime
        select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS if BR2_PACKAGE_BUSYBOX # bash
        select BR2_PACKAGE_COREUTILS # runtime (timeout)
-       select BR2_PACKAGE_CURL # runtime
+       select BR2_PACKAGE_LIBCURL_CURL # runtime
        select BR2_PACKAGE_IMAGEMAGICK # runtime
        select BR2_PACKAGE_JPEG # runtime
        select BR2_PACKAGE_LIBCURL # runtime

diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in
index 652285c0f863c3cf61ddcf7f06209dd4e474901d..d05cbedf77df8bf65a83a8bb80026412f778dc3b 100644 (file)
--- a/package/libcurl/Config.in
+++ b/package/libcurl/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBCURL
 
 if BR2_PACKAGE_LIBCURL
 
-config BR2_PACKAGE_CURL
+config BR2_PACKAGE_LIBCURL_CURL
        bool "curl binary"
        help
          Install curl binary as well

diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index a7f10ddde5fd11fa06f479b4726137ad460304c3..16b11ca9444edf3929364e0fa492385d83714637 100644 (file)
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -162,7 +162,7 @@ define LIBCURL_FIX_DOT_PC
 endef
 LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC)
 
-ifeq ($(BR2_PACKAGE_CURL),)
+ifeq ($(BR2_PACKAGE_LIBCURL_CURL),)
 define LIBCURL_TARGET_CLEANUP
        rm -rf $(TARGET_DIR)/usr/bin/curl
 endef