[Buildroot] [PATCH 0/2] package/openssl: move options to per-provider Config.in (branch yem/openssl-move-options)

[Buildroot] [PATCH 0/2] package/openssl: move options to per-provider Config.in (branch yem/openssl-move-options)

[Yann E. MORIN]

Hello All!

Small series that does just what it says on the tin.


Regards,
Yann E. MORIN.


The following changes since commit ca75e164a06fa016f35b9658ae1a7f59396ab64c

  package/wf111: update the upstream URL in Config.in (2019-12-30 21:21:56 +0100)


are available in the git repository at:

  git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 3c20be96d78c897e6a158af41df5b4462776e767

  package/libressl: move config options (2019-12-30 21:31:57 +0100)


----------------------------------------------------------------
Yann E. MORIN (2):
      package/libopenssl: move options
      package/libressl: move config options

 package/libopenssl/Config.in | 16 ++++++++++++++++
 package/libressl/Config.in   |  9 +++++++++
 package/openssl/Config.in    | 26 +-------------------------
 3 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 package/libressl/Config.in

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/2] package/libopenssl: move options

[Yann E. MORIN]

Since e3159cad71 (package/libopenssl: move target arch selection
to Config.in), we have a Config.in that contains a few options to
configure libopenssl (openSSL, the original).

As such, it makes sense to move the remaining options there too.

We also move the condition there, mimicking what is done for the
external toolchains' options too.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
---
 package/libopenssl/Config.in | 16 ++++++++++++++++
 package/openssl/Config.in    | 16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package/libopenssl/Config.in b/package/libopenssl/Config.in
index 5ca19b38f8..881518d1cb 100644
--- a/package/libopenssl/Config.in
+++ b/package/libopenssl/Config.in
@@ -1,3 +1,5 @@
+if BR2_PACKAGE_LIBOPENSSL
+
 # 4xx PowerPC cores seem to have trouble with openssl's ASM
 # optimizations
 config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH_LINUX_PPC
@@ -29,3 +31,17 @@ config BR2_PACKAGE_LIBOPENSSL_TARGET_ARCH
 	# https://github.com/openssl/openssl/issues/9839
 	default "linux-generic64 no-asm"	if BR2_ARCH_IS_64
 	default "linux-generic32 no-asm"
+
+config BR2_PACKAGE_LIBOPENSSL_BIN
+	bool "openssl binary"
+	help
+	  Install the openssl binary and the associated helper scripts
+	  to the target file system. This is a command line tool for
+	  doing various cryptographic stuff.
+
+config BR2_PACKAGE_LIBOPENSSL_ENGINES
+	bool "openssl additional engines"
+	help
+	  Install additional encryption engine libraries.
+
+endif # BR2_PACKAGE_LIBOPENSSL
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 4d37a3ecf9..01d3549aef 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -29,24 +29,8 @@ config BR2_PACKAGE_LIBOPENSSL
 
 	  Note: Some helper scripts need perl.
 
-if BR2_PACKAGE_LIBOPENSSL
-
-config BR2_PACKAGE_LIBOPENSSL_BIN
-	bool "openssl binary"
-	help
-	  Install the openssl binary and the associated helper scripts
-	  to the target file system. This is a command line tool for
-	  doing various cryptographic stuff.
-
-config BR2_PACKAGE_LIBOPENSSL_ENGINES
-	bool "openssl additional engines"
-	help
-	  Install additional encryption engine libraries.
-
 source "package/libopenssl/Config.in"
 
-endif
-
 config BR2_PACKAGE_LIBRESSL
 	bool "libressl"
 	depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
-- 
2.20.1

[Buildroot] [PATCH 2/2] package/libressl: move config options

[Yann E. MORIN]

As we've recently done for libopenssl (openssl, the original),
move the libressl option to a libressl-specific Config.in.

The gain is minimal at best, but this is mostly for symetry with
libopenssl.

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
---
 package/libressl/Config.in |  9 +++++++++
 package/openssl/Config.in  | 10 +---------
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 package/libressl/Config.in

diff --git a/package/libressl/Config.in b/package/libressl/Config.in
new file mode 100644
index 0000000000..600829cb9e
--- /dev/null
+++ b/package/libressl/Config.in
@@ -0,0 +1,9 @@
+if BR2_PACKAGE_LIBRESSL
+
+config BR2_PACKAGE_LIBRESSL_BIN
+	bool "openssl binary"
+	help
+	  Install the openssl binary to the target file system. This is
+	  a command line tool for doing various cryptographic stuff.
+
+endif
diff --git a/package/openssl/Config.in b/package/openssl/Config.in
index 01d3549aef..5ce91cb80f 100644
--- a/package/openssl/Config.in
+++ b/package/openssl/Config.in
@@ -44,15 +44,7 @@ config BR2_PACKAGE_LIBRESSL
 
 	  http://www.libressl.org/
 
-if BR2_PACKAGE_LIBRESSL
-
-config BR2_PACKAGE_LIBRESSL_BIN
-	bool "openssl binary"
-	help
-	  Install the openssl binary to the target file system. This is
-	  a command line tool for doing various cryptographic stuff.
-
-endif
+source "package/libressl/Config.in"
 
 # openssl from br2-external trees, if any
 source "$BR2_BASE_DIR/.br2-external.in.openssl"
-- 
2.20.1

[Buildroot] [PATCH 1/2] package/libopenssl: move options

[Thomas Petazzoni]

On Mon, 30 Dec 2019 21:36:14 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> Since e3159cad71 (package/libopenssl: move target arch selection
> to Config.in), we have a Config.in that contains a few options to
> configure libopenssl (openSSL, the original).
> 
> As such, it makes sense to move the remaining options there too.
> 
> We also move the condition there, mimicking what is done for the
> external toolchains' options too.
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Matt Weber <matthew.weber@rockwellcollins.com>

Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>


-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/libressl: move config options

[Thomas Petazzoni]

On Mon, 30 Dec 2019 21:36:15 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> As we've recently done for libopenssl (openssl, the original),
> move the libressl option to a libressl-specific Config.in.
> 
> The gain is minimal at best, but this is mostly for symetry with
> libopenssl.
> 
> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Matt Weber <matthew.weber@rockwellcollins.com>

Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 0/2] package/openssl: move options to per-provider Config.in (branch yem/openssl-move-options)

[Yann E. MORIN]

All,

On 2019-12-30 21:36 +0100, Yann E. MORIN spake thusly:
> Small series that does just what it says on the tin.
> ----------------------------------------------------------------
> Yann E. MORIN (2):
>       package/libopenssl: move options
>       package/libressl: move config options

Applied to master now, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/2] package/libopenssl: move options

[Matthew Weber]

Yann,


On Mon, Dec 30, 2019 at 4:33 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> On Mon, 30 Dec 2019 21:36:14 +0100
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
>
> > Since e3159cad71 (package/libopenssl: move target arch selection
> > to Config.in), we have a Config.in that contains a few options to
> > configure libopenssl (openSSL, the original).
> >
> > As such, it makes sense to move the remaining options there too.
> >
> > We also move the condition there, mimicking what is done for the
> > external toolchains' options too.
> >
> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > Cc: Matt Weber <matthew.weber@rockwellcollins.com>
>

Reviewed-by: Matt Weber <matthew.weber@rockwellcollins.com>