Skip to content

Commit

Permalink
netplan: upgrade 0.103 -> 0.104
Browse files Browse the repository at this point in the history
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 (openembedded#253)
Permit multiple patterns for the driver globs in match (openembedded#202), LP#1918421
Improve routing capabilities (openembedded#248), LP#1892272, LP#1805038
Support additional link offload options for networkd (openembedded#225) (openembedded#242), LP#1771740
Consolidate enum-to-string arrays (openembedded#230)
Handle differing ip6-privacy default value for NetworkManager (openembedded#263)
YAML state tracking (--state rootdir) for DBus API and netplan try (openembedded#231), LP#1943120
Support ConfigureWithoutCarrier (ignore-carrier) for networkd (openembedded#215)
Move primary git branch master to main
Documentation improvements (openembedded#226)
Compatibility for glib-2.70 (openembedded#235)
Cleanup Makefile, install only public headers
Improve test reliability & enable integration testing CI for autopkgtests
Netplan get to use the libnetplan parser (openembedded#252)
libnetplan:
- introduce the notion of NetplanState (openembedded#232)
- use an explicit parser context (openembedded#233)
- expose coherent generator APIs (openembedded#239)
- improve overall error handling (openembedded#234)
- consolidation of YAML parsing into the library (openembedded#241, openembedded#249, openembedded#250, openembedded#251)
Restrict the symbol export to a determined public API (openembedded#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 <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information
wangmingyu84 authored and kraj committed Feb 22, 2022
1 parent e76935d commit 62401f0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8645aee..50fc0da 100644
index 0368e41..53d6a9d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ BUILDFLAGS = \
-D_XOPEN_SOURCE=500 \
@@ -8,7 +8,6 @@ BUILDFLAGS = \
-DSBINDIR=\"$(SBINDIR)\" \
-I${CURDIR}/include \
-Wall \
- -Werror \
$(NULL)

SYSTEMD_GENERATOR_DIR=$(shell pkg-config --variable=systemdsystemgeneratordir systemd)
SRCS = \
--
2.25.1

Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,27 @@ 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 <zangrc.fnst@cn.fujitsu.com>

---
src/util.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/src/util.c b/src/util.c
index a4c0dba..fd4542d 100644
index 841ec12..59595da 100644
--- a/src/util.c
+++ b/src/util.c
@@ -25,6 +25,12 @@
#include "util.h"
#include "netplan.h"
@@ -32,6 +32,12 @@
#include "names.h"
#include "yaml-helpers.h"

+/* Don't fail if the standard library
+ * doesn't provide brace expansion */
+#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
+#endif
+
GHashTable* wifi_frequency_24;
GHashTable* wifi_frequency_5;
NETPLAN_ABI GHashTable*
wifi_frequency_24;

--
2.25.1

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

S = "${WORKDIR}/git"
SRCREV = "51c872d856db80281ea810ebc02e05c09d5310fa"
PV = "0.103"
SRCREV = "3e522b7255310bdecca6c781137741dfc4abc021"
PV = "0.104"

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

Expand Down

0 comments on commit 62401f0

Please sign in to comment.