diff mbox series

[1/1] Adding opkg configuration options for curl, curl with ssl, and sha256

Message ID SN6PR02MB39982FB384F220BD142434F9F24A0@SN6PR02MB3998.namprd02.prod.outlook.com
State Changes Requested
Headers show
Series [1/1] Adding opkg configuration options for curl, curl with ssl, and sha256 | expand

Commit Message

Baker, Derek June 25, 2018, 3:21 p.m. UTC 
From 51a9bc5b2fc6e40f8b076a7b153caf3d84489c9c Mon Sep 17 00:00:00 2001
From: Derek Baker <derek-baker@idexx.com>
Date: Thu, 14 Jun 2018 16:36:31 -0400
Subject: [PATCH 1/1] Adding opkg configuration options for curl, curl with
 ssl, and sha256

Signed-off-by: Derek Baker <derek-baker@idexx.com>
---
 package/opkg/Config.in | 13 +++++++++++++
 package/opkg/opkg.mk   | 20 +++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

--
2.17.1

Comments

Yann E. MORIN June 30, 2018, 5:23 p.m. UTC | #1 
Derek, All,

On 2018-06-25 15:21 +0000, Baker, Derek spake thusly:
> From 51a9bc5b2fc6e40f8b076a7b153caf3d84489c9c Mon Sep 17 00:00:00 2001
> From: Derek Baker <derek-baker@idexx.com>
> Date: Thu, 14 Jun 2018 16:36:31 -0400
> Subject: [PATCH 1/1] Adding opkg configuration options for curl, curl with
>  ssl, and sha256
> 
> Signed-off-by: Derek Baker <derek-baker@idexx.com>
> ---
>  package/opkg/Config.in | 13 +++++++++++++
>  package/opkg/opkg.mk   | 20 +++++++++++++++++++-
>  2 files changed, 32 insertions(+), 1 deletion(-)
> 
> diff --git a/package/opkg/Config.in b/package/opkg/Config.in
> index 20f6fa2f53..4ce3372bc0 100644
> --- a/package/opkg/Config.in
> +++ b/package/opkg/Config.in
> @@ -30,4 +30,17 @@ config BR2_PACKAGE_OPKG_GPG_SIGN
>        Enable opkg package signature checking support using
>        gnupg/libgpgme.
> 
> +config BR2_PACKAGE_OPKG_CURL
> +    bool "curl support"
> +    select BR2_PACKAGE_LIBCURL
> +
> +if BR2_PACKAGE_OPKG_CURL
> +config BR2_PACKAGE_OPKG_CURL_SSL
> +    select BR2_PACKAGE_OPENSSL
> +    bool "ssl support for curl"
> +endif

We don;t usually add options like that for optional features. Instead,
we let user enable the appropriate packages, and so...

> +config BR2_PACKAGE_OPKG_SHA256
> +    bool "SHA256 support"

Adding sha256 support looks like it is orthogonal to using libcurl,
right? If so, then this should be two patches, please: one to add
libcurl, then one to add sha256.

If sha256 is a requirement for libcurl, then make that the first patch.

>  endif
> diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
> index 4d34c6d4d3..d72f0bd97d 100644
> --- a/package/opkg/opkg.mk
> +++ b/package/opkg/opkg.mk
> @@ -10,7 +10,6 @@ OPKG_DEPENDENCIES = host-pkgconf libarchive
>  OPKG_LICENSE = GPL-2.0+
>  OPKG_LICENSE_FILES = COPYING
>  OPKG_INSTALL_STAGING = YES
> -OPKG_CONF_OPTS = --disable-curl
>  # Populate the conf/ directory
>  OPKG_AUTORECONF = YES
> 
> @@ -37,6 +36,25 @@ else
>  OPKG_CONF_OPTS += --disable-gpg
>  endif
> 
> +ifeq ($(BR2_PACKAGE_OPKG_SHA256),y)
> +OPKG_CONF_OPTS += --enable-sha256
> +endif
> +
> +ifeq ($(BR2_PACKAGE_OPKG_CURL),y)
> +OPKG_CONF_OPTS += --enable-curl
> +OPKG_DEPENDENCIES += libcurl
> +
> +ifeq ($(BR2_PACKAGE_OPKG_CURL_SSL),y)
> +OPKG_CONF_OPTS += --enable-ssl-curl
> +OPKG_DEPENDENCIES += libopenssl

Note in passing: you select the 'openssl' package, but you depend on
'libopenssl'. openssl is a virtual package that depends on either
'libopenssl' or 'libressl'. But see below on how to solve this...

> +else
> +OPKG_CONF_OPTS += --disable-ssl-curl
> +endif
> +
> +else
> +OPKG_CONF_OPTS += --disable-curl
> +endif

Here, we would just depend on the appropriate package being enabled.
Also, we like to forcibly disable the features. This would lo0ok a bit
like so:

    ifeq ($(BR2_PACKAGE_LIBCURL),y)
    OPKG_CONF_OPTS += --enable-curl
    OPKG_DEPENDENCIES += libcurl
    ifeq ($(BR2_PACKAGE_OPENSSL),y)
    OPKG_CONF_OPTS += --enable-ssl-curl
    OPKG_DEPENDENCIES += openssl
    else
    OPKG_CONF_OPTS += --disable-ssl-curl
    endif
    else
    OPKG_CONF_OPTS += --disable-curl --disable-ssl-curl
    endif # libcurl

Note: if only 'libopenssl' (aka upstream openssl) is supported, then
replace BR2_PACKAGE_OPENSSL by BR2_PACKAGE_LIBOPENSSL.

Regards,
Yann E. MORIN.

>  OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
> 
>  $(eval $(autotools-package))
> --
> 2.17.1

> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/opkg/Config.in b/package/opkg/Config.in
index 20f6fa2f53..4ce3372bc0 100644
--- a/package/opkg/Config.in
+++ b/package/opkg/Config.in
@@ -30,4 +30,17 @@  config BR2_PACKAGE_OPKG_GPG_SIGN
       Enable opkg package signature checking support using
       gnupg/libgpgme.

+config BR2_PACKAGE_OPKG_CURL
+    bool "curl support"
+    select BR2_PACKAGE_LIBCURL
+
+if BR2_PACKAGE_OPKG_CURL
+config BR2_PACKAGE_OPKG_CURL_SSL
+    select BR2_PACKAGE_OPENSSL
+    bool "ssl support for curl"
+endif
+
+config BR2_PACKAGE_OPKG_SHA256
+    bool "SHA256 support"
+
 endif
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
index 4d34c6d4d3..d72f0bd97d 100644
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -10,7 +10,6 @@  OPKG_DEPENDENCIES = host-pkgconf libarchive
 OPKG_LICENSE = GPL-2.0+
 OPKG_LICENSE_FILES = COPYING
 OPKG_INSTALL_STAGING = YES
-OPKG_CONF_OPTS = --disable-curl
 # Populate the conf/ directory
 OPKG_AUTORECONF = YES

@@ -37,6 +36,25 @@  else
 OPKG_CONF_OPTS += --disable-gpg
 endif

+ifeq ($(BR2_PACKAGE_OPKG_SHA256),y)
+OPKG_CONF_OPTS += --enable-sha256
+endif
+
+ifeq ($(BR2_PACKAGE_OPKG_CURL),y)
+OPKG_CONF_OPTS += --enable-curl
+OPKG_DEPENDENCIES += libcurl
+
+ifeq ($(BR2_PACKAGE_OPKG_CURL_SSL),y)
+OPKG_CONF_OPTS += --enable-ssl-curl
+OPKG_DEPENDENCIES += libopenssl
+else
+OPKG_CONF_OPTS += --disable-ssl-curl
+endif
+
+else
+OPKG_CONF_OPTS += --disable-curl
+endif
+
 OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR

 $(eval $(autotools-package))