Skip to contentSkip to conversation

[4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f

PATCH New Rolf Eike Beer 2 participants 4 messages Mar 4, 2021 Stable branch

lore
Share & tools
lore
author
#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")
Signed-off-by Rolf Eike Beer <[email protected]>
Signed-off-by Masahiro Yamada <[email protected]>
---
 scripts/Makefile | 1 +
 1 file changed, 1 insertion(+)
scripts/Makefile +0 -0
index 6a9f6db114b0..fb82adadb680 100644
@@ -25,6 +25,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)
HOSTLOADLIBES_sign-file = $(CRYPTO_LIBS) HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS) HOSTLOADLIBES_extract-cert = $(CRYPTO_LIBS)

Signature · 10 lines
2.30.1

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

Rolf Eike Beer

author
#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 4.4, 4.9, and 4.14. Backports to 4.19 and 5.4 were already sent and are already queued up.

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
author
#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.

Signed-off-by Rolf Eike Beer <[email protected]>
Signed-off-by Masahiro Yamada <[email protected]>
---
 scripts/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
scripts/Makefile +6 -2
index 25ab143cbe14..6a9f6db114b0 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_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash

@@ -22,8 +25,9 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
 
 HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
-HOSTLOADLIBES_sign-file = -lcrypto
-HOSTLOADLIBES_extract-cert = -lcrypto
+HOSTLOADLIBES_sign-file = $(CRYPTO_LIBS)
+HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
+HOSTLOADLIBES_extract-cert = $(CRYPTO_LIBS)
 
 always		:= $(hostprogs-y) $(hostprogs-m)
Signature · 10 lines
2.30.1

-- 
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 4.4, 4.9, and 4.14. Backports to 4.19 and 5.4 were already sent and are already queued up.

All now applied, thanks.

greg k-h