diff options
Diffstat (limited to 'meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch')
-rw-r--r-- | meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch b/meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch deleted file mode 100644 index dfc6f90c4c..0000000000 --- a/meta-networking/recipes-connectivity/netplan/netplan/0001-Handle-enum-element-override.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 6d284f1ff81494a5fca91a399b92b218ea1a9ea8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 8 Jun 2021 08:53:30 -0700 | ||
4 | Subject: [PATCH] Handle enum element override | ||
5 | |||
6 | NETPLAN_DEF_TYPE_VIRTUAL and NETPLAN_DEF_TYPE_BRIDGE point | ||
7 | to same value in enum, however here they are assigned individually | ||
8 | which results in overriding the initialization of the objects | ||
9 | |||
10 | Fixes | ||
11 | src/netplan.h:85:33: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides] | ||
12 | [NETPLAN_DEF_TYPE_BRIDGE] = "bridges", | ||
13 | ^~~~~~~~~ | ||
14 | Upstream-Status: Submitted [https://github.com/canonical/netplan/pull/213] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | src/netplan.h | 1 - | ||
18 | 1 file changed, 1 deletion(-) | ||
19 | |||
20 | diff --git a/src/netplan.h b/src/netplan.h | ||
21 | index d2c538b..26574f8 100644 | ||
22 | --- a/src/netplan.h | ||
23 | +++ b/src/netplan.h | ||
24 | @@ -81,7 +81,6 @@ static const char* const netplan_def_type_to_str[NETPLAN_DEF_TYPE_MAX_] = { | ||
25 | [NETPLAN_DEF_TYPE_ETHERNET] = "ethernets", | ||
26 | [NETPLAN_DEF_TYPE_WIFI] = "wifis", | ||
27 | [NETPLAN_DEF_TYPE_MODEM] = "modems", | ||
28 | - [NETPLAN_DEF_TYPE_VIRTUAL] = NULL, | ||
29 | [NETPLAN_DEF_TYPE_BRIDGE] = "bridges", | ||
30 | [NETPLAN_DEF_TYPE_BOND] = "bonds", | ||
31 | [NETPLAN_DEF_TYPE_VLAN] = "vlans", | ||
32 | -- | ||
33 | 2.32.0 | ||
34 | |||