diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-06-20 20:39:34 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-06-20 20:39:34 +0200 |
| commit | f6a22713708902cb564ceda50cd8a393fdfb84f0 (patch) | |
| tree | 6771cc3bd21b1b523f246d19e4974f957c4a768d /packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch | |
| parent | cfdae1abacb7e5689e36f8198b7cb92ca6542663 (diff) | |
| parent | aa73538c199c60ccf7528f2b00c2c762c2a5c6f5 (diff) | |
| download | vyos-build-f6a22713708902cb564ceda50cd8a393fdfb84f0.tar.gz vyos-build-f6a22713708902cb564ceda50cd8a393fdfb84f0.zip | |
Merge branch 'debian-bullseye' into current
* debian-bullseye:
T3641: hooks: use Python3 interpreter
vmware: tools.conf is now provided via vyos-1x-vmware package
Docker: T3641: add libiptc-dev build time dependency required by strongSwan
FRR: T3641: fix package build on Bullseye (workaround)
Docker: T3641: update rtrlib version 0.6.3 -> 0.7.0
Debian: T3641: switch to new distro Debian 11 - Bullseye
Diffstat (limited to 'packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch')
| -rw-r--r-- | packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch b/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch new file mode 100644 index 00000000..d1fb19e0 --- /dev/null +++ b/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch @@ -0,0 +1,25 @@ +From c88011519aba9462bf9e464830fcee5b6f7bfc25 Mon Sep 17 00:00:00 2001 +From: Christian Poessinger <christian@poessinger.com> +Date: Sat, 19 Jun 2021 13:38:56 +0000 +Subject: [PATCH] Debian: fix package build on Bullseye (workaround) + +This is the workaround mentioned in https://github.com/FRRouting/frr/issues/6502 +--- + debian/frr-doc.install | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debian/frr-doc.install b/debian/frr-doc.install +index c48dc5a8d..6cc87e9cb 100644 +--- a/debian/frr-doc.install ++++ b/debian/frr-doc.install +@@ -3,7 +3,7 @@ usr/share/doc/frr/html + + # info + images referenced by it + usr/share/info/ +-doc/user/_build/texinfo/*.png usr/share/info ++#doc/user/_build/texinfo/*.png usr/share/info + + # other + README.md usr/share/doc/frr +-- +2.30.2 |