[pve-devel] [PATCH frr 1/2] update patches

Alexandre Derumier aderumier at odiso.com
Fri Nov 5 09:16:51 CET 2021


Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 ...e-ax_python.m4-to-hardcode-python3.9.patch | 25 --------
 .../patches/pve/0001-enable-bgp-daemon.patch  |  8 +--
 ...on-for-RT-auto-derivation-to-force-A.patch | 59 ++++++++++---------
 debian/patches/series                         |  1 -
 4 files changed, 34 insertions(+), 59 deletions(-)
 delete mode 100644 debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch

diff --git a/debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch b/debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
deleted file mode 100644
index 50073d9..0000000
--- a/debian/patches/0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej at sury.org>
-Date: Sun, 7 Feb 2021 13:14:17 +0100
-Subject: Adjust the ax_python.m4 to hardcode python3.9
-
----
- m4/ax_python.m4 | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/m4/ax_python.m4 b/m4/ax_python.m4
-index 9f43ea0..815bf47 100644
---- a/m4/ax_python.m4
-+++ b/m4/ax_python.m4
-@@ -186,11 +186,7 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-       AC_MSG_RESULT([yes])
- 
-       PYTHON_CFLAGS="`\"$pycfg\" --includes`"
--      if test x"${py_ver}" = x"3.8" || test x"{py_ver}" = x"3.9"; then
--        PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
--      else
--        PYTHON_LIBS="`\"$pycfg\" --ldflags`"
--      fi
-+      PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
- 
-       AC_MSG_CHECKING([whether ${pycfg} provides a working build environment])
-       _FRR_PYTHON_DEVENV([$py_hex], [
diff --git a/debian/patches/pve/0001-enable-bgp-daemon.patch b/debian/patches/pve/0001-enable-bgp-daemon.patch
index a9818c9..e1c65b3 100644
--- a/debian/patches/pve/0001-enable-bgp-daemon.patch
+++ b/debian/patches/pve/0001-enable-bgp-daemon.patch
@@ -9,12 +9,12 @@ Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
-index 8bec3c5bb..7cdfa840c 100644
+index b1526888e..27bc120a7 100644
 --- a/tools/etc/frr/daemons
 +++ b/tools/etc/frr/daemons
 @@ -14,7 +14,7 @@
  #
- # The watchfrr and zebra daemons are always started.
+ # The watchfrr, zebra and staticd daemons are always started.
  #
 -bgpd=no
 +bgpd=yes
@@ -29,7 +29,7 @@ index 8bec3c5bb..7cdfa840c 100644
 +bfdd=yes
  fabricd=no
  vrrpd=no
- 
+ pathd=no
 -- 
-2.20.1
+2.30.2
 
diff --git a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
index 3306fbc..8cc94af 100644
--- a/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
+++ b/debian/patches/pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
@@ -1,7 +1,7 @@
-From c3e66b067564281a58fcf3b99559d289a75090e9 Mon Sep 17 00:00:00 2001
+From c05ce62d655144e74bf432830130e83ec3617ec1 Mon Sep 17 00:00:00 2001
 From: Alexandre Derumier <aderumier at odiso.com>
 Date: Tue, 17 Nov 2020 06:01:26 +0100
-Subject: [PATCH 1/3] bgpd : add an option for RT auto-derivation to force AS
+Subject: [PATCH] bgpd : add an option for RT auto-derivation to force AS
 
 Allow to define a custom AS for autort AS:VNI
 
@@ -10,16 +10,16 @@ as route-target AS:VNI need to be the same on the each peer
 
 Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
 ---
- bgpd/bgp_evpn.c     | 12 +++++++++--
- bgpd/bgp_evpn_vty.c | 49 +++++++++++++++++++++++++++++++--------------
+ bgpd/bgp_evpn.c     | 12 ++++++++++--
+ bgpd/bgp_evpn_vty.c | 47 +++++++++++++++++++++++++++++++++------------
  bgpd/bgpd.h         |  3 +++
- 3 files changed, 47 insertions(+), 17 deletions(-)
+ 3 files changed, 48 insertions(+), 14 deletions(-)
 
 diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
-index 84e8960ee..73acc5d7b 100644
+index 8d8e3ffd2..135c1a610 100644
 --- a/bgpd/bgp_evpn.c
 +++ b/bgpd/bgp_evpn.c
-@@ -512,7 +512,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
+@@ -491,7 +491,11 @@ static void form_auto_rt(struct bgp *bgp, vni_t vni, struct list *rtl)
  
  	if (bgp->advertise_autort_rfc8365)
  		vni |= EVPN_AUTORT_VXLAN;
@@ -32,7 +32,7 @@ index 84e8960ee..73acc5d7b 100644
  
  	ecomadd = ecommunity_new();
  	ecommunity_add_val(ecomadd, &eval, false, false);
-@@ -4238,7 +4242,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
+@@ -4367,7 +4371,11 @@ void evpn_rt_delete_auto(struct bgp *bgp, vni_t vni, struct list *rtl)
  
  	if (bgp->advertise_autort_rfc8365)
  		vni |= EVPN_AUTORT_VXLAN;
@@ -46,23 +46,24 @@ index 84e8960ee..73acc5d7b 100644
  	ecom_auto = ecommunity_new();
  	ecommunity_add_val(ecom_auto, &eval, false, false);
 diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
-index e9e2aafeb..6cc6bba33 100644
+index 3fc1dc128..4c2bae1eb 100644
 --- a/bgpd/bgp_evpn_vty.c
 +++ b/bgpd/bgp_evpn_vty.c
-@@ -3226,32 +3226,48 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
+@@ -3517,32 +3517,52 @@ DEFUN (no_bgp_evpn_advertise_all_vni,
  	return CMD_SUCCESS;
  }
  
 -DEFUN (bgp_evpn_advertise_autort_rfc8365,
 -       bgp_evpn_advertise_autort_rfc8365_cmd,
 -       "autort rfc8365-compatible",
--       "Auto-derivation of RT\n"
++DEFPY (bgp_evpn_advertise_autort,
++       bgp_evpn_advertise_autort_cmd,
++       "autort [rfc8365-compatible]$rfc8365 [as (1-65536)$as]",
+        "Auto-derivation of RT\n"
 -       "Auto-derivation of RT using RFC8365\n")
-+DEFPY(bgp_evpn_advertise_autort, bgp_evpn_advertise_autort_cmd,
-+      "autort [rfc8365-compatible]$rfc8365 [as (1-65536)$as]",
-+      "Auto-derivation of RT\n"
-+      "Auto-derivation of RT using RFC8365\n"
-+      "Auto-derivation AS\n")
++       "Auto-derivation of RT using RFC8365\n"
++       "Auto-derivation AS\n"
++       "ASN\n")
  {
  	struct bgp *bgp = VTY_GET_CONTEXT(bgp);
  
@@ -84,15 +85,15 @@ index e9e2aafeb..6cc6bba33 100644
 -DEFUN (no_bgp_evpn_advertise_autort_rfc8365,
 -       no_bgp_evpn_advertise_autort_rfc8365_cmd,
 -       "no autort rfc8365-compatible",
--       NO_STR
--       "Auto-derivation of RT\n"
++DEFPY (no_bgp_evpn_advertise_autort,
++       no_bgp_evpn_advertise_autort_cmd,
++       "no autort [rfc8365-compatible]$rfc8365 [as (1-65536)$as]",
+        NO_STR
+        "Auto-derivation of RT\n"
 -       "Auto-derivation of RT using RFC8365\n")
-+DEFPY(no_bgp_evpn_advertise_autort, no_bgp_evpn_advertise_autort_cmd,
-+      "no autort [rfc8365-compatible]$rfc8365 [as (1-65536)$as]",
-+      NO_STR
-+      "Auto-derivation of RT\n"
-+      "Auto-derivation of RT using RFC8365\n"
-+      "Auto-derivation AS\n")
++       "Auto-derivation of RT using RFC8365\n"
++       "Auto-derivation AS\n"
++       "ASN\n")
  {
  	struct bgp *bgp = VTY_GET_CONTEXT(bgp);
  
@@ -111,7 +112,7 @@ index e9e2aafeb..6cc6bba33 100644
  	return CMD_SUCCESS;
  }
  
-@@ -5596,6 +5612,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
+@@ -6055,6 +6075,9 @@ void bgp_config_write_evpn_info(struct vty *vty, struct bgp *bgp, afi_t afi,
  	if (bgp->advertise_autort_rfc8365)
  		vty_out(vty, "  autort rfc8365-compatible\n");
  
@@ -121,7 +122,7 @@ index e9e2aafeb..6cc6bba33 100644
  	if (bgp->advertise_gw_macip)
  		vty_out(vty, "  advertise-default-gw\n");
  
-@@ -5732,8 +5751,8 @@ void bgp_ethernetvpn_init(void)
+@@ -6213,8 +6236,8 @@ void bgp_ethernetvpn_init(void)
  	install_element(BGP_EVPN_NODE, &evpnrt5_network_cmd);
  	install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_all_vni_cmd);
  	install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_all_vni_cmd);
@@ -133,10 +134,10 @@ index e9e2aafeb..6cc6bba33 100644
  	install_element(BGP_EVPN_NODE, &no_bgp_evpn_advertise_default_gw_cmd);
  	install_element(BGP_EVPN_NODE, &bgp_evpn_advertise_svi_ip_cmd);
 diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
-index d22fd008d..941066e2e 100644
+index 4c69fbcdf..2c4d45bb2 100644
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -614,6 +614,9 @@ struct bgp {
+@@ -639,6 +639,9 @@ struct bgp {
  	/* EVPN - use RFC 8365 to auto-derive RT */
  	int advertise_autort_rfc8365;
  
@@ -147,5 +148,5 @@ index d22fd008d..941066e2e 100644
  	 * Flooding mechanism for BUM packets for VxLAN-EVPN.
  	 */
 -- 
-2.20.1
+2.30.2
 
diff --git a/debian/patches/series b/debian/patches/series
index 41c48c5..50b22cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-Adjust-the-ax_python.m4-to-hardcode-python3.9.patch
 pve/0001-enable-bgp-daemon.patch
 pve/0002-bgpd-add-an-option-for-RT-auto-derivation-to-force-A.patch
-- 
2.30.2




More information about the pve-devel mailing list