Skip to content

Commit 6ed9d2d

Browse files
wangmingyu84kraj
authored andcommitted
netplan: upgrade 0.103 -> 0.104
refresh patches for 0.104: 0001-Makefile-do-not-use-Werror.patch 0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch 0001-parse-nm-fix-32bit-format-string.patch removed since it's included in 0.104 Changelog: ========= Enable embedded-switch-mode setting on SmartNICs (#253) Permit multiple patterns for the driver globs in match (#202), LP#1918421 Improve routing capabilities (#248), LP#1892272, LP#1805038 Support additional link offload options for networkd (#225) (#242), LP#1771740 Consolidate enum-to-string arrays (#230) Handle differing ip6-privacy default value for NetworkManager (#263) YAML state tracking (--state rootdir) for DBus API and netplan try (#231), LP#1943120 Support ConfigureWithoutCarrier (ignore-carrier) for networkd (#215) Move primary git branch master to main Documentation improvements (#226) Compatibility for glib-2.70 (#235) Cleanup Makefile, install only public headers Improve test reliability & enable integration testing CI for autopkgtests Netplan get to use the libnetplan parser (#252) libnetplan: - introduce the notion of NetplanState (#232) - use an explicit parser context (#233) - expose coherent generator APIs (#239) - improve overall error handling (#234) - consolidation of YAML parsing into the library (#241, #249, #250, #251) Restrict the symbol export to a determined public API (#227) - WARNING: We dropped some internal symbols from the API that we know have no external consumers (that we are aware of) - 0.103: _serialize_yaml, contains_netdef_type, tmp, validate_default_route_consistency - 0.102: cur_filename, netplan_netdef_new - 0.100: address_option_handlers, is_hostname, validate_ovs_target, wireguard_peer_handlers - 0.99: current_file, is_ip4_address, is_ip6_address, missing_id, missing_ids_found, parser_error, validate_backend_rules, validate_netdef_grammar, yaml_error Signed-off-by: Wang Mingyu <[email protected]> Signed-off-by: Khem Raj <[email protected]>
1 parent 124c19a commit 6ed9d2d

File tree

4 files changed

+18
-39
lines changed

4 files changed

+18
-39
lines changed

meta-networking/recipes-connectivity/netplan/netplan/0001-Makefile-do-not-use-Werror.patch

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ Signed-off-by: Alexander Kanavin <[email protected]>
1010
1 file changed, 1 deletion(-)
1111

1212
diff --git a/Makefile b/Makefile
13-
index 8645aee..50fc0da 100644
13+
index 0368e41..53d6a9d 100644
1414
--- a/Makefile
1515
+++ b/Makefile
16-
@@ -7,7 +7,6 @@ BUILDFLAGS = \
17-
-D_XOPEN_SOURCE=500 \
16+
@@ -8,7 +8,6 @@ BUILDFLAGS = \
1817
-DSBINDIR=\"$(SBINDIR)\" \
18+
-I${CURDIR}/include \
1919
-Wall \
2020
- -Werror \
2121
$(NULL)
2222

23-
SYSTEMD_GENERATOR_DIR=$(shell pkg-config --variable=systemdsystemgeneratordir systemd)
23+
SRCS = \
24+
--
25+
2.25.1
26+

meta-networking/recipes-connectivity/netplan/netplan/0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,27 @@ Date: Fri, 25 Dec 2020 11:41:43 +0900
44
Subject: [PATCH] don't fail if GLOB_BRACE is not defined
55

66
Signed-off-by: Zang Ruochen <[email protected]>
7-
87
---
98
src/util.c | 6 ++++++
109
1 file changed, 6 insertions(+)
1110

1211
diff --git a/src/util.c b/src/util.c
13-
index a4c0dba..fd4542d 100644
12+
index 841ec12..59595da 100644
1413
--- a/src/util.c
1514
+++ b/src/util.c
16-
@@ -25,6 +25,12 @@
17-
#include "util.h"
18-
#include "netplan.h"
15+
@@ -32,6 +32,12 @@
16+
#include "names.h"
17+
#include "yaml-helpers.h"
1918

2019
+/* Don't fail if the standard library
2120
+ * doesn't provide brace expansion */
2221
+#ifndef GLOB_BRACE
2322
+#define GLOB_BRACE 0
2423
+#endif
2524
+
26-
GHashTable* wifi_frequency_24;
27-
GHashTable* wifi_frequency_5;
25+
NETPLAN_ABI GHashTable*
26+
wifi_frequency_24;
2827

28+
--
29+
2.25.1
30+

meta-networking/recipes-connectivity/netplan/netplan/0001-parse-nm-fix-32bit-format-string.patch

Lines changed: 0 additions & 25 deletions
This file was deleted.

meta-networking/recipes-connectivity/netplan/netplan_0.103.bb renamed to meta-networking/recipes-connectivity/netplan/netplan_0.104.bb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ LICENSE = "GPLv3"
1111
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
1212

1313
S = "${WORKDIR}/git"
14-
SRCREV = "51c872d856db80281ea810ebc02e05c09d5310fa"
15-
PV = "0.103"
14+
SRCREV = "3e522b7255310bdecca6c781137741dfc4abc021"
15+
PV = "0.104"
1616

1717
SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \
18-
file://0001-parse-nm-fix-32bit-format-string.patch \
1918
file://0001-Makefile-do-not-use-Werror.patch \
2019
"
2120

0 commit comments

Comments
 (0)