summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch')
-rw-r--r--meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch44
1 files changed, 32 insertions, 12 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch b/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
index 22ecae304..af28ba71e 100644
--- a/meta-openembedded/meta-networking/recipes-connectivity/netplan/netplan/0001-dbus-Remove-unused-variabes.patch
+++ b/meta-openembedded/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);
+