From 53ceb249883ed0dafef2c30db6ff9bef621aba1e Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 22 Dec 2024 12:00:10 +0100 Subject: T6674: move patches to "package/" subfolder This prevents the accidental applying of a patch to multiple source directories defined in package.toml. Example FRR: Package consits of build instructions for libyang, rtrlib and frr itself. Previously patches in frr/patches folder got applied to libyang, rtrlib and frr which made no sense and could also fail a build. --- ...001-Enable-PCRE2-in-Debian-package-builds.patch | 24 ------------------ .../patches/0003-Clear-Babel-Config-On-Stop.patch | 29 ---------------------- ...001-Enable-PCRE2-in-Debian-package-builds.patch | 24 ++++++++++++++++++ .../frr/0003-Clear-Babel-Config-On-Stop.patch | 29 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 scripts/package-build/frr/patches/0001-Enable-PCRE2-in-Debian-package-builds.patch delete mode 100644 scripts/package-build/frr/patches/0003-Clear-Babel-Config-On-Stop.patch create mode 100644 scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch create mode 100644 scripts/package-build/frr/patches/frr/0003-Clear-Babel-Config-On-Stop.patch (limited to 'scripts/package-build/frr') diff --git a/scripts/package-build/frr/patches/0001-Enable-PCRE2-in-Debian-package-builds.patch b/scripts/package-build/frr/patches/0001-Enable-PCRE2-in-Debian-package-builds.patch deleted file mode 100644 index c31c4a85..00000000 --- a/scripts/package-build/frr/patches/0001-Enable-PCRE2-in-Debian-package-builds.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 21800432167ac022c01772df993efca8d4969b38 Mon Sep 17 00:00:00 2001 -From: Daniil Baturin -Date: Wed, 6 Nov 2024 15:58:10 +0000 -Subject: [PATCH] Enable PCRE2 in Debian package builds - ---- - debian/rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/debian/rules b/debian/rules -index 43e5d7e61..1f971ab22 100755 ---- a/debian/rules -+++ b/debian/rules -@@ -69,6 +69,7 @@ override_dh_auto_configure: - --enable-vty-group=frrvty \ - --enable-configfile-mask=0640 \ - --enable-logfile-mask=0640 \ -+ --enable-pcre2posix \ - # end - - override_dh_auto_install: --- -2.47.0 - diff --git a/scripts/package-build/frr/patches/0003-Clear-Babel-Config-On-Stop.patch b/scripts/package-build/frr/patches/0003-Clear-Babel-Config-On-Stop.patch deleted file mode 100644 index fea45891..00000000 --- a/scripts/package-build/frr/patches/0003-Clear-Babel-Config-On-Stop.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c3c70e87b040233263b9594d14582dfedfecc92e Mon Sep 17 00:00:00 2001 -From: Yaroslav Kholod -Date: Wed, 18 Dec 2024 11:48:29 +0200 -Subject: [PATCH] #17413: Clean babeld config on stop - ---- - babeld/babeld.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/babeld/babeld.c b/babeld/babeld.c -index b562f0b70..6f1a9a3d7 100644 ---- a/babeld/babeld.c -+++ b/babeld/babeld.c -@@ -304,6 +304,12 @@ void babel_clean_routing_process(void) - flush_all_routes(); - babel_interface_close_all(); - -+ /* Clean babel config */ -+ diversity_kind = DIVERSITY_NONE; -+ diversity_factor = BABEL_DEFAULT_DIVERSITY_FACTOR; -+ resend_delay = BABEL_DEFAULT_RESEND_DELAY; -+ smoothing_half_life = BABEL_DEFAULT_SMOOTHING_HALF_LIFE; -+ - /* cancel events */ - event_cancel(&babel_routing_process->t_read); - event_cancel(&babel_routing_process->t_update); --- -2.43.0 - diff --git a/scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch b/scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch new file mode 100644 index 00000000..545e7d5e --- /dev/null +++ b/scripts/package-build/frr/patches/frr/0001-Enable-PCRE2-in-Debian-package-builds.patch @@ -0,0 +1,24 @@ +From 21800432167ac022c01772df993efca8d4969b38 Mon Sep 17 00:00:00 2001 +From: Daniil Baturin +Date: Wed, 6 Nov 2024 15:58:10 +0000 +Subject: [PATCH] Enable PCRE2 in Debian package builds + +--- + debian/rules | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/debian/rules b/debian/rules +index 43e5d7e61..1f971ab22 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -69,6 +69,7 @@ override_dh_auto_configure: + --enable-vty-group=frrvty \ + --enable-configfile-mask=0640 \ + --enable-logfile-mask=0640 \ ++ --enable-pcre2posix \ + # end + + override_dh_auto_install: +-- +2.47.0 + diff --git a/scripts/package-build/frr/patches/frr/0003-Clear-Babel-Config-On-Stop.patch b/scripts/package-build/frr/patches/frr/0003-Clear-Babel-Config-On-Stop.patch new file mode 100644 index 00000000..fea45891 --- /dev/null +++ b/scripts/package-build/frr/patches/frr/0003-Clear-Babel-Config-On-Stop.patch @@ -0,0 +1,29 @@ +From c3c70e87b040233263b9594d14582dfedfecc92e Mon Sep 17 00:00:00 2001 +From: Yaroslav Kholod +Date: Wed, 18 Dec 2024 11:48:29 +0200 +Subject: [PATCH] #17413: Clean babeld config on stop + +--- + babeld/babeld.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/babeld/babeld.c b/babeld/babeld.c +index b562f0b70..6f1a9a3d7 100644 +--- a/babeld/babeld.c ++++ b/babeld/babeld.c +@@ -304,6 +304,12 @@ void babel_clean_routing_process(void) + flush_all_routes(); + babel_interface_close_all(); + ++ /* Clean babel config */ ++ diversity_kind = DIVERSITY_NONE; ++ diversity_factor = BABEL_DEFAULT_DIVERSITY_FACTOR; ++ resend_delay = BABEL_DEFAULT_RESEND_DELAY; ++ smoothing_half_life = BABEL_DEFAULT_SMOOTHING_HALF_LIFE; ++ + /* cancel events */ + event_cancel(&babel_routing_process->t_read); + event_cancel(&babel_routing_process->t_update); +-- +2.43.0 + -- cgit v1.2.3