NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libcurl: rename curl binary config symbol

Browse Source 
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>
This commit is contained in:
Baruch Siach 2020-02-10 14:06:59 +02:00 committed by Peter Korsgaard
parent 8e267afcc2
commit 2a057339cc
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Config.in.legacy
View File

@ -146,6 +146,14 @@ endif
comment "Legacy options removed in 2020.02" 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 config BR2_PACKAGE_GSTREAMER
bool "gstreamer-0.10 removed" bool "gstreamer-0.10 removed"
select BR2_LEGACY select BR2_LEGACY

2
docs/manual/adding-packages-tips.txt
View File

@ -98,7 +98,7 @@ config snippet. For example, here's how you would test +libcurl+ with
---- ----
$ cat libcurl.config $ cat libcurl.config
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCURL_CURL=y
BR2_PACKAGE_OPENSSL=y BR2_PACKAGE_OPENSSL=y
---- ----

2
package/dehydrated/Config.in
View File

@ -4,7 +4,7 @@ config BR2_PACKAGE_DEHYDRATED
select BR2_PACKAGE_BASH select BR2_PACKAGE_BASH
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash
select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_CURL select BR2_PACKAGE_LIBCURL_CURL
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL

2
package/glslsandbox-player/Config.in
View File

@ -41,7 +41,7 @@ config BR2_PACKAGE_GLSLSANDBOX_PLAYER_SCRIPTS
select BR2_PACKAGE_BASH # runtime select BR2_PACKAGE_BASH # runtime
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS if BR2_PACKAGE_BUSYBOX # bash select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS if BR2_PACKAGE_BUSYBOX # bash
select BR2_PACKAGE_COREUTILS # runtime (timeout) 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_IMAGEMAGICK # runtime
select BR2_PACKAGE_JPEG # runtime select BR2_PACKAGE_JPEG # runtime
select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL # runtime

2
package/libcurl/Config.in
View File

@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBCURL
if BR2_PACKAGE_LIBCURL if BR2_PACKAGE_LIBCURL
config BR2_PACKAGE_CURL config BR2_PACKAGE_LIBCURL_CURL
bool "curl binary" bool "curl binary"
help help
Install curl binary as well Install curl binary as well

2
package/libcurl/libcurl.mk
View File

@ -162,7 +162,7 @@ define LIBCURL_FIX_DOT_PC
endef endef
LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_LIBCURL_OPENSSL),LIBCURL_FIX_DOT_PC) 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 define LIBCURL_TARGET_CLEANUP
rm -rf $(TARGET_DIR)/usr/bin/curl rm -rf $(TARGET_DIR)/usr/bin/curl
endef endef