Skip to contentSkip to conversation

package/openssl: move options to per-provider Config.in (branch yem/openssl-move-options)

PATCH New Yann E. MORIN 3 participants 7 messages Dec 30, 2019 – Jan 2, 2020

lore
Share & tools
lore
#0 lore raw

cover package/openssl: move options to per-provider Config.in (branch yem/openssl-move-options)

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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/2 package/libopenssl: move options

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.

Cc Thomas Petazzoni <[email protected]>
Cc Matt Weber <[email protected]>
---
 package/libopenssl/Config.in | 16 ++++++++++++++++
 package/openssl/Config.in    | 16 ----------------
 2 files changed, 16 insertions(+), 16 deletions(-)
package/libopenssl/Config.in +16 -0
index 5ca19b38f8..881518d1cb 100644
@@ -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
package/openssl/Config.in +0 -16
index 4d37a3ecf9..01d3549aef 100644
@@ -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
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 package/libopenssl: move options

Quoted 4 lines · On Mon, 30 Dec 2019 21:36:14 +0100 "Yann E. MORIN" <[email protected]>…

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).

Quoted 8 lines

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.

Cc Thomas Petazzoni <[email protected]>
Cc Matt Weber <[email protected]>
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 package/libopenssl: move options

Yann,

Quoted 8 lines · Thomas Petazzoni
Quoted 4 lines · On Mon, 30 Dec 2019 21:36:14 +0100 "Yann E. MORIN" <[email protected]>…

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).

Quoted 9 lines
Quoted 8 lines

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.

Cc Thomas Petazzoni <[email protected]>
Cc Matt Weber <[email protected]>
#4 lore raw

PATCH 2/2 package/libressl: move config options

In reply to 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.

Cc Thomas Petazzoni <[email protected]>
Cc Matt Weber <[email protected]>
---
 package/libressl/Config.in |  9 +++++++++
 package/openssl/Config.in  | 10 +---------
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 package/libressl/Config.in
package/libressl/Config.in new file +9 -0
new file mode 100644
index 0000000000..600829cb9e
@@ -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
package/openssl/Config.in +1 -9
index 01d3549aef..5ce91cb80f 100644
@@ -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"
Signature · 1 line
2.20.1
#5 lore raw

PATCH 2/2 package/libressl: move config options

Quoted 9 lines · On Mon, 30 Dec 2019 21:36:15 +0100 "Yann E. MORIN" <[email protected]>…

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.

Cc Thomas Petazzoni <[email protected]>
Cc Matt Weber <[email protected]>
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author Applied
#6 lore raw

cover package/openssl: move options to per-provider Config.in (branch yem/openssl-move-options)

In reply to Yann E. MORIN

All,

On 2019-12-30 21:36 +0100, Yann E. MORIN spake thusly:

Quoted 5 lines

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.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'