[pve-devel] [PATCH ifupdown2] remove upstreamed patches

Alexandre Derumier aderumier at odiso.com
Mon Jun 18 14:09:17 CEST 2018


https://github.com/CumulusNetworks/ifupdown2/pull/59

0001-addons-scripts-fix-ENV-for-interfaces-options.patch
&&
0003-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch

have been applied upstream
---
 ....patch => 0001-add-vxlan-physdev-support.patch} |  0
 ...ns-scripts-fix-ENV-for-interfaces-options.patch | 29 ---------------------
 ...3-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch | 30 ----------------------
 debian/patches/series                              |  4 +--
 4 files changed, 1 insertion(+), 62 deletions(-)
 rename debian/patches/extra/{0002-add-vxlan-physdev-support.patch => 0001-add-vxlan-physdev-support.patch} (100%)
 delete mode 100644 debian/patches/extra/0001-addons-scripts-fix-ENV-for-interfaces-options.patch
 delete mode 100644 debian/patches/extra/0003-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch

diff --git a/debian/patches/extra/0002-add-vxlan-physdev-support.patch b/debian/patches/extra/0001-add-vxlan-physdev-support.patch
similarity index 100%
rename from debian/patches/extra/0002-add-vxlan-physdev-support.patch
rename to debian/patches/extra/0001-add-vxlan-physdev-support.patch
diff --git a/debian/patches/extra/0001-addons-scripts-fix-ENV-for-interfaces-options.patch b/debian/patches/extra/0001-addons-scripts-fix-ENV-for-interfaces-options.patch
deleted file mode 100644
index 5c9e40a..0000000
--- a/debian/patches/extra/0001-addons-scripts-fix-ENV-for-interfaces-options.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Mon, 14 May 2018 16:27:22 +0200
-Subject: [PATCH] addons scripts : fix ENV for interfaces options
-
-This is a bug currently, where env vars with interfaces options
-were not reset between interfaces
-
-https://github.com/CumulusNetworks/ifupdown2/issues/49
----
- ifupdown2/ifupdown/ifupdownmain.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ifupdown2/ifupdown/ifupdownmain.py b/ifupdown2/ifupdown/ifupdownmain.py
-index 2daf49f..4931f73 100644
---- a/ifupdown2/ifupdown/ifupdownmain.py
-+++ b/ifupdown2/ifupdown/ifupdownmain.py
-@@ -1552,7 +1552,7 @@ class ifupdownMain(ifupdownBase):
-         cenv = None
-         iface_env = ifaceobj.get_env()
-         if iface_env:
--            cenv = os.environ
-+            cenv = dict(os.environ)
-             if cenv:
-                 cenv.update(iface_env)
-             else:
--- 
-2.11.0
-
diff --git a/debian/patches/extra/0003-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch b/debian/patches/extra/0003-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch
deleted file mode 100644
index 13dfbc6..0000000
--- a/debian/patches/extra/0003-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier at odiso.com>
-Date: Wed, 16 May 2018 02:16:42 +0200
-Subject: [PATCH] netlink : IFLA_BRPORT_ARP_SUPPRESS : use 32
-
-this has been upstreamed recently in linux kernel, with IFLA_BRPORT_NEIGH_SUPPRESS.
-cumulus was using a temp 152 number.
-It's need for vxlan + anycast gateway
----
- ifupdown2/nlmanager/nlpacket.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ifupdown2/nlmanager/nlpacket.py b/ifupdown2/nlmanager/nlpacket.py
-index d6f93fe..28c43c2 100644
---- a/ifupdown2/nlmanager/nlpacket.py
-+++ b/ifupdown2/nlmanager/nlpacket.py
-@@ -3306,9 +3306,9 @@ class Link(NetlinkPacket):
-     IFLA_BRPORT_VLAN_TUNNEL         = 29
-     IFLA_BRPORT_BCAST_FLOOD         = 30
-     IFLA_BRPORT_GROUP_FWD_MASK      = 31
-+    IFLA_BRPORT_ARP_SUPPRESS        = 32
-     IFLA_BRPORT_PEER_LINK           = 150
-     IFLA_BRPORT_DUAL_LINK           = 151
--    IFLA_BRPORT_ARP_SUPPRESS        = 152
-     IFLA_BRPORT_GROUP_FWD_MASKHI    = 153
-     IFLA_BRPORT_DOWN_PEERLINK_REDIRECT = 154
- 
--- 
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 42616c4..1375181 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-extra/0001-addons-scripts-fix-ENV-for-interfaces-options.patch
-extra/0002-add-vxlan-physdev-support.patch
-extra/0003-netlink-IFLA_BRPORT_ARP_SUPPRESS-use-32.patch
+extra/0001-add-vxlan-physdev-support.patch
 pve/0001-config-tuning.patch
 pve/0002-manual-interfaces-set-link-up.patch
 pve/0003-don-t-remove-tap-veth-fwpr-interfaces-from-bridge-on.patch
-- 
2.11.0



More information about the pve-devel mailing list