From 3233d1716e719700a0c93afdcb7baec40ada7086 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 16 May 2023 00:47:06 +0200 Subject: [PATCH] patch: remove old upstreamed patches Signed-off-by: Alexandre Derumier Signed-off-by: Thomas Lamprecht --- ...-subinterface-in-a-vlan-aware-bridge.patch | 49 ----------- .../pve/0014-fix-pointopoint-regression.patch | 28 ------ debian/patches/series | 6 +- .../0001-ovs-add-support-for-fakebridge.patch | 57 ------------ ...-check-vlan-protocol-for-not-dotted-.patch | 88 ------------------- 5 files changed, 1 insertion(+), 227 deletions(-) delete mode 100644 debian/patches/pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch delete mode 100644 debian/patches/pve/0014-fix-pointopoint-regression.patch delete mode 100644 debian/patches/upstream/0001-ovs-add-support-for-fakebridge.patch delete mode 100644 debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch diff --git a/debian/patches/pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch b/debian/patches/pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch deleted file mode 100644 index d9f190e..0000000 --- a/debian/patches/pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 8187e6e4a8cea198d86c4df8117335b7b93047d0 Mon Sep 17 00:00:00 2001 -From: Alexandre Derumier -Date: Mon, 1 Apr 2019 09:17:11 +0200 -Subject: [PATCH 4/7] allow vlan subinterface in a vlan-aware bridge - -for stacked/qinq vlan, it's perfectly fine to have a vlan-aware bridge with a tagged interface port - -fix: -https://github.com/CumulusNetworks/ifupdown2/issues/92 - -sample config: - -auto eth0.2 -iface eth0.2 inet manual - -auto bridge -iface bridge inet manual - bridge-ports eth0.2 - bridge-stp off - bridge-fd 0 - bridge-vlan-aware yes - -bridge 8000.c81f66f8688c no eth0.2 - -Signed-off-by: Alexandre Derumier -Signed-off-by: Thomas Lamprecht ---- - ifupdown2/addons/bridge.py | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py -index 35944ac..f353d6c 100644 ---- a/ifupdown2/addons/bridge.py -+++ b/ifupdown2/addons/bridge.py -@@ -890,11 +890,6 @@ class bridge(Addon, moduleBase): - result = True - for port_name in ports: - port_obj_l = ifaceobj_getfunc(port_name) -- if port_obj_l and port_obj_l[0].link_kind & ifaceLinkKind.VLAN: -- self.logger.error('%s: %s: vlan sub-interface is not ' -- 'supported in a vlan-aware bridge' -- % (ifaceobj.name, port_name)) -- result = False - if (port_obj_l and - port_obj_l[0].get_attr_value('bridge-arp-nd-suppress') and - self.arp_nd_suppress_only_on_vxlan and --- -2.20.1 - diff --git a/debian/patches/pve/0014-fix-pointopoint-regression.patch b/debian/patches/pve/0014-fix-pointopoint-regression.patch deleted file mode 100644 index 68ee3a0..0000000 --- a/debian/patches/pve/0014-fix-pointopoint-regression.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 416e7623eb92524c7100aebc7b7265056737813d Mon Sep 17 00:00:00 2001 -From: Alexandre Derumier -Date: Mon, 26 Jul 2021 08:05:38 +0200 -Subject: [PATCH] fix pointopoint regression - -partially revert ba5437b9ecf9aa1401ac985ebf97009cc3114481 - -https://forum.proxmox.com/threads/hetzner-pve-7-0-problems-after-reboot-maybe-ifupdown2.92935/ -Signed-off-by: Alexandre Derumier ---- - ifupdown2/lib/nlcache.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ifupdown2/lib/nlcache.py b/ifupdown2/lib/nlcache.py -index 9350ced..08f1108 100644 ---- a/ifupdown2/lib/nlcache.py -+++ b/ifupdown2/lib/nlcache.py -@@ -3172,7 +3172,6 @@ class NetlinkListenerWithCache(nllistener.NetlinkManagerWithListener, BaseObject - - if peer: - log_msg.append("peer %s" % peer) -- peer = ipnetwork.IPAddress(peer) - - packet.add_attribute(Address.IFA_ADDRESS, peer) - packet_prefixlen = peer.prefixlen --- -2.30.2 - diff --git a/debian/patches/series b/debian/patches/series index a7c8da8..ac79b43 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ pve/0001-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch pve/0002-add-dummy-mtu-bridgevlanport-modules.patch -pve/0003-allow-vlan-subinterface-in-a-vlan-aware-bridge.patch pve/0004-don-t-remove-bridge-is-tap-veth-are-still-plugged.patch pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch pve/0006-config-tuning.patch @@ -10,7 +9,4 @@ pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch pve/0010-postinst-rm-update-network-config-compatibility.patch pve/0011-d-rules-drop-now-default-with-systemd.patch pve/0012-d-rules-add-dh_installsystemd-override-for-compat-12.patch -pve/0013-postinst-reload-network-config-on-first-install.patch -pve/0014-fix-pointopoint-regression.patch -upstream/0001-ovs-add-support-for-fakebridge.patch -upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch \ No newline at end of file +pve/0013-postinst-reload-network-config-on-first-install.patch \ No newline at end of file diff --git a/debian/patches/upstream/0001-ovs-add-support-for-fakebridge.patch b/debian/patches/upstream/0001-ovs-add-support-for-fakebridge.patch deleted file mode 100644 index 7e9eb67..0000000 --- a/debian/patches/upstream/0001-ovs-add-support-for-fakebridge.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 39b395b1fd41e5ac4066c5afd19b6ab9c17b8b14 Mon Sep 17 00:00:00 2001 -From: alexandre derumier -Date: Thu, 1 Sep 2022 19:18:21 +0200 -Subject: [PATCH] addons: openvswitch : add support for fakebridge. - -Fake bridge are are ovsbridge child of a parent bridge with a specific vlan tag. - -``` -auto br-parent -iface br-parent inet manual - ovs_type OVSBridge - -auto br-fakev10 -iface br-fakev10 inet manual - ovs_type OVSBridge - ovs_bridge br-parent - ovs_options br-parent 10 - -``` ---- - ifupdown2/addons/openvswitch.py | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/ifupdown2/addons/openvswitch.py b/ifupdown2/addons/openvswitch.py -index 2c9a76f7..0a124ba2 100644 ---- a/ifupdown2/addons/openvswitch.py -+++ b/ifupdown2/addons/openvswitch.py -@@ -74,6 +74,10 @@ class openvswitch(Addon, moduleBase): - "required": False, - "example": ["ovs-ports-condone-regex ^[a-zA-Z0-9]+_v[0-9]{1,4}$"] - }, -+ 'ovs-bridge': { -+ 'help': 'Optional parent bridge for fake bridges', -+ 'required': False, -+ }, - } - } - -@@ -147,13 +151,17 @@ def _addbridge (self, ifaceobj): - ovsextra = ifaceobj.get_attr_value('ovs-extra') - ovsmtu = ifaceobj.get_attr_value_first ('ovs-mtu') - ovsportscondoneregex = self._get_ovs_port_condone_regex(ifaceobj) -+ ovsparent = ifaceobj.get_attr_value_first ('ovs-bridge') - - cmd_list = [] - - cmd = "--may-exist add-br %s"%(iface) -+ if ovsparent is not None and ovsoptions: -+ cmd = cmd + " %s" %(ovsoptions) -+ - cmd_list.append(cmd) - -- if ovsoptions: -+ if ovsparent is None and ovsoptions: - cmd = "set bridge %s %s" %(iface, ovsoptions) - cmd_list.append(cmd) - diff --git a/debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch b/debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch deleted file mode 100644 index 402c5e2..0000000 --- a/debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch +++ /dev/null @@ -1,88 +0,0 @@ -From e50a7ccadb460bf923d841d620080f351fd74d9d Mon Sep 17 00:00:00 2001 -From: Alexandre Derumier -Date: Thu, 20 Apr 2023 11:48:11 +0200 -Subject: [PATCH] vlan: query_check: check vlan-protocol for not dotted - interface - ---- - ifupdown2/addons/vlan.py | 44 +++++++++++++++++++++------------------- - 1 file changed, 23 insertions(+), 21 deletions(-) - -diff --git a/ifupdown2/addons/vlan.py b/ifupdown2/addons/vlan.py -index 584fe6e..3b045dc 100644 ---- a/ifupdown2/addons/vlan.py -+++ b/ifupdown2/addons/vlan.py -@@ -224,10 +224,13 @@ class vlan(Addon, moduleBase): - def _query_check(self, ifaceobj, ifaceobjcurr): - if not self.cache.link_exists(ifaceobj.name): - return -+ -+ ifname = ifaceobj.name -+ cached_vlan_info_data = self.cache.get_link_info_data(ifname) -+ - if '.' not in ifaceobj.name: - # if vlan name is not in the dot format, check its running state - -- ifname = ifaceobj.name - cached_vlan_raw_device = self.cache.get_lower_device_ifname(ifname) - - # -@@ -239,8 +242,6 @@ class vlan(Addon, moduleBase): - cached_vlan_raw_device != ifaceobj.get_attr_value_first('vlan-raw-device') - ) - -- cached_vlan_info_data = self.cache.get_link_info_data(ifname) -- - # - # vlan-id - # -@@ -252,27 +253,28 @@ class vlan(Addon, moduleBase): - cached_vlan_id_str = str(cached_vlan_id) - ifaceobjcurr.update_config_with_status('vlan-id', cached_vlan_id_str, vlanid_config != cached_vlan_id_str) - -- # -- # vlan-protocol -- # -- protocol_config = ifaceobj.get_attr_value_first('vlan-protocol') -- if protocol_config: -+ # -+ # vlan-protocol (dot or not dot format) -+ # -+ protocol_config = ifaceobj.get_attr_value_first('vlan-protocol') -+ if protocol_config: - -- cached_vlan_protocol = cached_vlan_info_data.get(Link.IFLA_VLAN_PROTOCOL) -+ cached_vlan_protocol = cached_vlan_info_data.get(Link.IFLA_VLAN_PROTOCOL) - -- if protocol_config.upper() != cached_vlan_protocol.upper(): -- ifaceobjcurr.update_config_with_status( -- 'vlan-protocol', -- cached_vlan_protocol, -- 1 -- ) -- else: -- ifaceobjcurr.update_config_with_status( -- 'vlan-protocol', -- protocol_config, -- 0 -- ) -+ if protocol_config.upper() != cached_vlan_protocol.upper(): -+ ifaceobjcurr.update_config_with_status( -+ 'vlan-protocol', -+ cached_vlan_protocol, -+ 1 -+ ) -+ else: -+ ifaceobjcurr.update_config_with_status( -+ 'vlan-protocol', -+ protocol_config, -+ 0 -+ ) - -+ if '.' not in ifaceobj.name: - # - # vlan-bridge-binding - # --- -2.30.2 - -- 2.39.2