netplan: upgrade 0.101 -> 0.102

0001-dbus-Remove-unused-variabes.patch
0002-Makefile-Exclude-.h-files-from-target-rule.patch
Removed since these are included in 0.102.

Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
zangrc
2021-06-07 16:12:26 +08:00
committed by Khem Raj
parent 4b16dedac6
commit d612ad6f32
3 changed files with 2 additions and 95 deletions
@@ -1,59 +0,0 @@
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: Submitted [https://github.com/CanonicalLtd/netplan/pull/175]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
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 9606fea..8e1ed9d 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -242,9 +242,6 @@ static int
method_info(sd_bus_message *m, void *userdata, sd_bus_error *ret_error)
{
sd_bus_message *reply = NULL;
- g_autoptr(GError) err = NULL;
- g_autofree gchar *stdout = NULL;
- g_autofree gchar *stderr = NULL;
gint exit_status = 0;
exit_status = sd_bus_message_new_method_return(m, &reply);
diff --git a/src/networkd.c b/src/networkd.c
index 7c86cd6..7200740 100644
--- a/src/networkd.c
+++ b/src/networkd.c
@@ -897,7 +897,6 @@ append_wpa_auth_conf(GString* s, const NetplanAuthenticationSettings* auth, cons
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);
diff --git a/src/parse.c b/src/parse.c
index 033c657..faca27f 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -1899,7 +1899,6 @@ handle_wireguard_peers(yaml_document_t* doc, yaml_node_t* node, const void* _, G
}
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);
--
2.25.1
@@ -1,32 +0,0 @@
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 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: 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 4fa6bd8..567d326 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ generate: libnetplan.so.$(NETPLAN_SOVER) nm.o networkd.o openvswitch.o generate.
$(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 util.o
- $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0`
+ $(CC) $(BUILDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(patsubst %.h,,$^) `pkg-config --cflags --libs libsystemd glib-2.0 gio-2.0`
src/_features.h: src/[^_]*.[hc]
printf "#include <stddef.h>\nstatic const char *feature_flags[] __attribute__((__unused__)) = {\n" > $@
--
2.25.1
@@ -11,13 +11,11 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
S = "${WORKDIR}/git"
SRCREV = "e445b87b9dff439ec564c245d030b03d61eb0f24"
PV = "0.101+git${SRCPV}"
SRCREV = "62701436991e42606c4e9e8dbdcdc5067d64f69b"
PV = "0.102+git${SRCPV}"
SRC_URI = " \
git://github.com/CanonicalLtd/netplan.git \
file://0001-dbus-Remove-unused-variabes.patch \
file://0002-Makefile-Exclude-.h-files-from-target-rule.patch \
"
SRC_URI_append_libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch"