diff options
author | zangrc <zangrc.fnst@cn.fujitsu.com> | 2020-11-27 09:55:54 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-11-27 14:21:57 -0800 |
commit | 9ef0c70871c86d5b5a0e5248eb019c701b0572b5 (patch) | |
tree | 5abb2d02c0bc7b109bd21145333bff50e966b657 /meta-networking | |
parent | d9874ce27c7a2ff3ed2a3a2e5f6de810f10421ae (diff) | |
download | meta-openembedded-contrib-9ef0c70871c86d5b5a0e5248eb019c701b0572b5.tar.gz |
netplan: upgrade 0.99 -> 0.100
0001-src-parse.c-Initialize-key-to-NULL.patch
Removed since this is included in 0.100.
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch | 44 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch | 32 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch (renamed from meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch) | 21 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/netplan/netplan_0.100.bb (renamed from meta-networking/recipes-connectivity/netplan/netplan_0.99.bb) | 7 |
4 files changed, 43 insertions, 61 deletions
diff --git a/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch b/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch index 22ecae3047..af28ba71e7 100644 --- a/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch +++ b/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch @@ -1,24 +1,27 @@ -From 0edb96a5f79dcec4f4467193716c2bf015fe5132 Mon Sep 17 00:00:00 2001 +From e5bd4c3853fb394edc8cbea17fad82ce23bd0fae Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Aug 2020 10:38:07 -0700 +Date: Fri, 27 Nov 2020 12:21:32 -0800 Subject: [PATCH 1/2] dbus: Remove unused variabes +This issue is seen when using clang to compile it + +Same fix is needed for parse.c and networkd.c, + Fixes src/dbus.c:49:23: error: unused variable 'stdout' [-Werror,-Wunused-variable] g_autofree gchar *stdout = NULL; ^ - -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/CanonicalLtd/netplan/pull/175] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - src/dbus.c | 3 --- - 1 file changed, 3 deletions(-) + src/dbus.c | 3 --- + src/networkd.c | 1 - + src/parse.c | 1 - + 3 files changed, 5 deletions(-) -diff --git a/src/dbus.c b/src/dbus.c -index cb7ec38..a057236 100644 --- a/src/dbus.c +++ b/src/dbus.c -@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message *m, void *userdata, sd_bus_error *ret_err +@@ -45,9 +45,6 @@ static int method_apply(sd_bus_message * static int method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { sd_bus_message *reply = NULL; @@ -28,6 +31,23 @@ index cb7ec38..a057236 100644 gint exit_status = 0; exit_status = sd_bus_message_new_method_return(m, &reply); --- -2.28.0 - +--- a/src/networkd.c ++++ b/src/networkd.c +@@ -896,7 +896,6 @@ append_wpa_auth_conf(GString* s, const N + static void + write_wpa_unit(const NetplanNetDefinition* def, const char* rootdir) + { +- g_autoptr(GError) err = NULL; + g_autofree gchar *stdouth = NULL; + + stdouth = systemd_escape(def->id); +--- a/src/parse.c ++++ b/src/parse.c +@@ -1898,7 +1898,6 @@ handle_wireguard_peers(yaml_document_t* + } + + for (yaml_node_item_t *i = node->data.sequence.items.start; i < node->data.sequence.items.top; i++) { +- g_autofree char* addr = NULL; + yaml_node_t *entry = yaml_document_get_node(doc, *i); + assert_type(entry, YAML_MAPPING_NODE); + diff --git a/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch b/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch deleted file mode 100644 index a710b1e576..0000000000 --- a/meta-networking/recipes-connectivity/netplan/netplan/0001-src-parse.c-Initialize-key-to-NULL.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 63de116c617a35ff3d54c785b3dfb5378bb07f46 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Aug 2020 22:39:17 -0700 -Subject: [PATCH] src/parse.c: Initialize key to NULL - -Fixes - -src/parse.c:810:22: note: 'key' was declared here -cc1: all warnings being treated as errors - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/parse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/parse.c b/src/parse.c -index 63a0863..c66277f 100644 ---- a/src/parse.c -+++ b/src/parse.c -@@ -807,7 +807,7 @@ handle_addresses(yaml_document_t* doc, yaml_node_t* node, const void* _, GError* - char* prefix_len; - guint64 prefix_len_num; - yaml_node_t *entry = yaml_document_get_node(doc, *i); -- yaml_node_t *key, *value = NULL; -+ yaml_node_t *key = NULL, *value = NULL; - - if (entry->type != YAML_SCALAR_NODE && entry->type != YAML_MAPPING_NODE) { - return yaml_error(entry, error, "expected either scalar or mapping (check indentation)"); --- -2.28.0 - diff --git a/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch b/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch index e736529a8a..cd75d1cb1c 100644 --- a/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch +++ b/meta-networking/recipes-connectivity/netplan/netplan/0002-Makefile-Exclude-.h-files-from-target-rule.patch @@ -1,35 +1,30 @@ -From 1da4451fd3470e6600b027cb78526b440e296f8b Mon Sep 17 00:00:00 2001 +From 5abb6b8343b5d2633844144979b40f398450b544 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 12 Aug 2020 10:47:08 -0700 -Subject: [PATCH 2/2] Makefile: Use first prerquisite only for target rule +Date: Fri, 27 Nov 2020 12:22:32 -0800 +Subject: [PATCH 2/2] Makefile: Exclude .h files from target rule This ensures that src/_features.h is not added to compiler cmdline which -can confuse the compiler as it may not understand .h as valid input and -complain +can confuse the compilers e.g. clang as it may not like .h as valid input +and complain | clang-11: error: cannot specify -o when generating multiple output files | make: *** [Makefile:50: netplan-dbus] Error 1 | make: *** Waiting for unfinished jobs.... -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/CanonicalLtd/netplan/pull/175] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index 4495773..c05dea3 100644 --- a/Makefile +++ b/Makefile -@@ -47,7 +47,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o generate.o sriov.o +@@ -47,7 +47,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ -L. -lnetplan `pkg-config --cflags --libs glib-2.0 gio-2.0 yaml-0.1 uuid` netplan-dbus: src/dbus.c src/_features.h - $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0` -+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< `pkg-config --cflags --libs libsystemd glib-2.0` ++ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0` src/_features.h: src/[^_]*.[hc] printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@ --- -2.28.0 - diff --git a/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb b/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb index 5546f300b3..2f74a22c05 100644 --- a/meta-networking/recipes-connectivity/netplan/netplan_0.99.bb +++ b/meta-networking/recipes-connectivity/netplan/netplan_0.100.bb @@ -11,14 +11,13 @@ LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" S = "${WORKDIR}/git" -SRCREV = "85134d13eb1ee5a1a7d139cd74ffa10933d73677" -PV = "0.99+git${SRCPV}" +SRCREV = "b7d32aebc880f3161b8f97ee56b729c0c54dd0e4" +PV = "0.100+git${SRCPV}" SRC_URI = " \ git://github.com/CanonicalLtd/netplan.git \ file://0001-dbus-Remove-unused-variabes.patch \ - file://0002-Makefile-Use-first-prerquisite-only-for-target-rule.patch \ - file://0001-src-parse.c-Initialize-key-to-NULL.patch \ + file://0002-Makefile-Exclude-.h-files-from-target-rule.patch \ " DEPENDS = "glib-2.0 libyaml ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |