* [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f
@ 2021-03-04 7:23 Rolf Eike Beer
2021-03-04 7:25 ` [PATCH 4.14 / 4.9 / 4.4 1/2] scripts: use pkg-config to locate libcrypto Rolf Eike Beer
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Rolf Eike Beer @ 2021-03-04 7:23 UTC (permalink / raw)
To: stable
[-- Attachment #1: Type: text/plain, Size: 628 bytes --]
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
--
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
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 4.14 / 4.9 / 4.4 1/2] scripts: use pkg-config to locate libcrypto
2021-03-04 7:23 [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f Rolf Eike Beer
@ 2021-03-04 7:25 ` Rolf Eike Beer
2021-03-04 7:26 ` [PATCH 4.14 / 4.9 / 4.4 2/2] scripts: set proper OpenSSL include dir also for sign-file Rolf Eike Beer
2021-03-04 13:35 ` [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Rolf Eike Beer @ 2021-03-04 7:25 UTC (permalink / raw)
To: stable
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 <eb@emlix.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/Makefile | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/Makefile b/scripts/Makefile
index 25ab143cbe14..6a9f6db114b0 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -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)
--
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4.14 / 4.9 / 4.4 2/2] scripts: set proper OpenSSL include dir also for sign-file
2021-03-04 7:23 [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f Rolf Eike Beer
2021-03-04 7:25 ` [PATCH 4.14 / 4.9 / 4.4 1/2] scripts: use pkg-config to locate libcrypto Rolf Eike Beer
@ 2021-03-04 7:26 ` Rolf Eike Beer
2021-03-04 13:35 ` [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Rolf Eike Beer @ 2021-03-04 7:26 UTC (permalink / raw)
To: stable
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
commit fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f upstream.
Fixes: 2cea4a7a1885 ("scripts: use pkg-config to locate libcrypto")
Signed-off-by: Rolf Eike Beer <eb@emlix.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
scripts/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/Makefile b/scripts/Makefile
index 6a9f6db114b0..fb82adadb680 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -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)
--
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
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 313 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f
2021-03-04 7:23 [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f Rolf Eike Beer
2021-03-04 7:25 ` [PATCH 4.14 / 4.9 / 4.4 1/2] scripts: use pkg-config to locate libcrypto Rolf Eike Beer
2021-03-04 7:26 ` [PATCH 4.14 / 4.9 / 4.4 2/2] scripts: set proper OpenSSL include dir also for sign-file Rolf Eike Beer
@ 2021-03-04 13:35 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-03-04 13:35 UTC (permalink / raw)
To: Rolf Eike Beer; +Cc: stable
On Thu, Mar 04, 2021 at 08:23:34AM +0100, Rolf Eike Beer wrote:
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-04 13:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-04 7:23 [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f Rolf Eike Beer
2021-03-04 7:25 ` [PATCH 4.14 / 4.9 / 4.4 1/2] scripts: use pkg-config to locate libcrypto Rolf Eike Beer
2021-03-04 7:26 ` [PATCH 4.14 / 4.9 / 4.4 2/2] scripts: set proper OpenSSL include dir also for sign-file Rolf Eike Beer
2021-03-04 13:35 ` [4.14 / 4.9 / 4.4] backport of 2cea4a7a1885bd0c765089afc14f7ff0eb77864e and fe968c41ac4f4ec9ffe3c4cf16b72285f5e9674f Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox