From 0d27e1955f4b3699e3dc4312b066c5db50e66fff Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 11 Oct 2021 20:41:24 +0200 Subject: [PATCH] netplan: do not use -Werror This addresses openssl 3.x deprecation warnings turning into errors. Signed-off-by: Alexander Kanavin Signed-off-by: Khem Raj --- .../0001-Makefile-do-not-use-Werror.patch | 23 +++++++++++++++++++ ...-t-fail-if-GLOB_BRACE-is-not-defined.patch | 7 ++++-- .../netplan/netplan_0.103.bb | 4 +++- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch diff --git a/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch b/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch new file mode 100644 index 0000000000..ddc44c3ca0 --- /dev/null +++ b/meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch @@ -0,0 +1,23 @@ +From a06c77557ed951249d5b344441ad6ec57410e63f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Sun, 3 Oct 2021 21:52:16 +0200 +Subject: [PATCH] Makefile: do not use -Werror + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 8645aee..50fc0da 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,6 @@ BUILDFLAGS = \ + -D_XOPEN_SOURCE=500 \ + -DSBINDIR=\"$(SBINDIR)\" \ + -Wall \ +- -Werror \ + $(NULL) + + SYSTEMD_GENERATOR_DIR=$(shell pkg-config --variable=systemdsystemgeneratordir systemd) diff --git a/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch b/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch index 0fa6ba48a4..c7d371dfa0 100644 --- a/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch +++ b/meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch @@ -1,16 +1,19 @@ -From ceb4111af317ecc54d97bb21878dcccbfdb2983e Mon Sep 17 00:00:00 2001 +From e0df1f07d1707d5daf0358cc60b30f06121f7e60 Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Fri, 25 Dec 2020 11:41:43 +0900 Subject: [PATCH] don't fail if GLOB_BRACE is not defined Signed-off-by: Zang Ruochen + --- src/util.c | 6 ++++++ 1 file changed, 6 insertions(+) +diff --git a/src/util.c b/src/util.c +index a4c0dba..fd4542d 100644 --- a/src/util.c +++ b/src/util.c -@@ -24,6 +24,12 @@ +@@ -25,6 +25,12 @@ #include "util.h" #include "netplan.h" diff --git a/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb b/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb index 682a6b611d..3527bceeb2 100644 --- a/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb +++ b/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb @@ -15,7 +15,9 @@ SRCREV = "51c872d856db80281ea810ebc02e05c09d5310fa" PV = "0.103" SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main \ - file://0001-parse-nm-fix-32bit-format-string.patch" + file://0001-parse-nm-fix-32bit-format-string.patch \ + file://0001-Makefile-do-not-use-Werror.patch \ + " SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch"