summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-10-20 15:37:41 +0800
committerJia Zhang <10241344+jiazhang0@users.noreply.github.com>2021-10-21 15:57:54 +0800
commit4dc1be23d9ef6f693c3b8b2b82fae02727532f8a (patch)
treeec1e36cb89f7288bd0e28186fcdf1cc980cc67f4
parentcb5693390215fae87197de1abc71a460458182b5 (diff)
downloadmeta-secure-core-4dc1be23d9ef6f693c3b8b2b82fae02727532f8a.tar.gz
sbsigntool: fix build with openssl 3.0
Disable '-Werror' to prevent openssl 3.0 deprecation warnings turning into errors until upstream addresses openssl 3.0 compatibility issue. Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-rw-r--r--meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-Makefile.am-do-not-use-Werror.patch31
-rw-r--r--meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-Makefile.am-do-not-use-Werror.patch b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-Makefile.am-do-not-use-Werror.patch
new file mode 100644
index 0000000..5bb2dc4
--- /dev/null
+++ b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool/0001-Makefile.am-do-not-use-Werror.patch
@@ -0,0 +1,31 @@
1From 06c9f0846f98b8ad92285b422199438f02c7bfdf Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 20 Oct 2021 15:31:05 +0800
4Subject: [PATCH] Makefile.am: do not use -Werror
5
6Do not use -Werror to disable openssl 3.0 deprecation warnings turning
7into errors.
8
9Upstream-Status: Pending
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 src/Makefile.am | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/Makefile.am b/src/Makefile.am
17index a3257fa..784b061 100644
18--- a/src/Makefile.am
19+++ b/src/Makefile.am
20@@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Wextra --std=gnu99
21 common_SOURCES = idc.c idc.h image.c image.h fileio.c fileio.h \
22 ../lib/ccan.git/ccan/read_write_all/read_write_all.c efivars.h $(coff_headers)
23 common_LDADD = ../lib/ccan/libccan.a $(libcrypto_LIBS)
24-common_CFLAGS = -I$(top_srcdir)/lib/ccan/ -Werror
25+common_CFLAGS = -I$(top_srcdir)/lib/ccan/
26
27 sbsign_SOURCES = sbsign.c $(common_SOURCES)
28 sbsign_LDADD = $(common_LDADD)
29--
302.17.1
31
diff --git a/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb
index e19d34f..7fa841c 100644
--- a/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb
+++ b/meta-signing-key/recipes-devtools/sbsigntool/sbsigntool_git.bb
@@ -18,6 +18,7 @@ SRC_URI = " \
18 file://0003-sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch \ 18 file://0003-sbsign-add-x-option-to-avoid-overwrite-existing-sign.patch \
19 file://0001-src-Makefile.am-Add-read_write_all.c-to-common_SOURC.patch \ 19 file://0001-src-Makefile.am-Add-read_write_all.c-to-common_SOURC.patch \
20 file://0001-fileio.c-initialize-local-variables-before-use-in-fu.patch \ 20 file://0001-fileio.c-initialize-local-variables-before-use-in-fu.patch \
21 file://0001-Makefile.am-do-not-use-Werror.patch \
21" 22"
22SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826" 23SRCREV_sbsigntools ?= "f12484869c9590682ac3253d583bf59b890bb826"
23SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5" 24SRCREV_ccan ?= "b1f28e17227f2320d07fe052a8a48942fe17caa5"