Skip to contentSkip to conversation

[5.4 / 4.19] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f

PATCH New Rolf Eike Beer 2 participants 4 messages Feb 22, 2021 – Feb 25, 2021 Stable branch

lore
Share & tools
lore
#2 lore raw

PATCH 2/2 scripts: set proper OpenSSL include dir also for sign-file

In reply to Rolf Eike Beer

commit fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f upstream.

Fixes 2cea4a7a1885 ("scripts: use pkg-config to locate libcrypto")
---
 scripts/Makefile | 1 +
 1 file changed, 1 insertion(+)
scripts/Makefile +1 -0
index 5f8d3671a709..b4b7d8b58cd6 100644
@@ -26,6 +26,7 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
 
 HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
+HOSTCFLAGS_sign-file.o = $(CRYPTO_CFLAGS)
 HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)
 HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
 HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)
Signature · 1 line
2.30.0
#0 lore raw

Hi,

the attached patches are the backport of these 2 patches for tools/Makefile that allows building when OpenSSL is not at the default location. They apply cleanly to both to 5.4.99 and 4.19.176. Backports for older stable kernels will follow.

Greetings,

Eike

Signature · 7 lines
Rolf Eike Beer, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax +49 551 30664-11
Gothaer Platz 3, 37083 Göttingen, Germany
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055

emlix - smart embedded open source
#1 lore raw

PATCH 1/2 scripts: use pkg-config to locate libcrypto

commit 2cea4a7a1885bd0c765089afc14f7ff0eb77864e upstream.

Otherwise build fails if the headers are not in the default location. While at it also ask pkg-config for the libs, with fallback to the existing value.

---
 scripts/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
scripts/Makefile +6 -2
index 3e86b300f5a1..5f8d3671a709 100644
@@ -10,6 +10,9 @@
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 
+CRYPTO_LIBS = $(shell pkg-config --libs libcrypto 2> /dev/null || echo -lcrypto)
+CRYPTO_CFLAGS = $(shell pkg-config --cflags libcrypto 2> /dev/null)
+
 hostprogs-$(CONFIG_BUILD_BIN2C)  += bin2c
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
@@ -23,8 +26,9 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
 
 HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
-HOSTLDLIBS_sign-file = -lcrypto
-HOSTLDLIBS_extract-cert = -lcrypto
+HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)
+HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
+HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)
 
 always		:= $(hostprogs-y) $(hostprogs-m)
 
Signature · 10 lines
2.30.0

-- 
Rolf Eike Beer, emlix GmbH, http://www.emlix.com
Fon +49 551 30664-0, Fax +49 551 30664-11
Gothaer Platz 3, 37083 Göttingen, Germany
Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055

emlix - smart embedded open source
#3 lore raw
In reply to Rolf Eike Beer
Quoted 6 lines · Rolf Eike Beer

Hi,

the attached patches are the backport of these 2 patches for tools/Makefile that allows building when OpenSSL is not at the default location. They apply cleanly to both to 5.4.99 and 4.19.176. Backports for older stable kernels will follow.

Now queued up, thanks.

greg k-h