summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 09:56:25 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 09:56:25 +0000
commit17e3216f2d8ffd2798f99e3275ea17949cfee1a5 (patch)
treedfc393748fc7dbadbde9f3a9aa5d94990f6eb34c /debian/patches
parentMerging upstream version 10.1. (diff)
downloadfrr-debian.tar.xz
frr-debian.zip
Adding debian version 10.1-0.1.debian/10.1-0.1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/add-XREF_SETUP-to-libraries-and-utilites.patch72
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 73 deletions
diff --git a/debian/patches/add-XREF_SETUP-to-libraries-and-utilites.patch b/debian/patches/add-XREF_SETUP-to-libraries-and-utilites.patch
deleted file mode 100644
index 7237e4d..0000000
--- a/debian/patches/add-XREF_SETUP-to-libraries-and-utilites.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3ca60d00b1a3ca3822db5fcf6ba46cf3ac0a6b0b Mon Sep 17 00:00:00 2001
-From: David Lamparter <equinox@opensourcerouting.org>
-Date: Thu, 2 May 2024 10:55:11 +0200
-Subject: [PATCH] *: add XREF_SETUP() to libraries and utilites
-
-This is theoretically not needed if neither DEFUNs nor zlog_* calls are
-used, except I'm about to turn it into a build error to catch the cases
-where it _is_ necessary. Which is libmgmt_be_nb.la in this case, where
-it causes build failures on hppa.
-
-Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
----
- fpm/fpm_pb.c | 5 +++++
- mgmtd/mgmt_be_nb.c | 6 ++++++
- mgmtd/subdir.am | 1 +
- qpb/qpb.c | 5 +++++
- 4 files changed, 17 insertions(+)
- create mode 100644 mgmtd/mgmt_be_nb.c
-
-diff --git a/fpm/fpm_pb.c b/fpm/fpm_pb.c
-index e4c9395a84a6..0e8f618c4d3c 100644
---- a/fpm/fpm_pb.c
-+++ b/fpm/fpm_pb.c
-@@ -10,3 +10,8 @@
- /*
- * Main file for the fpm_pb library.
- */
-+
-+#include "config.h"
-+#include "xref.h"
-+
-+XREF_SETUP();
-diff --git a/mgmtd/mgmt_be_nb.c b/mgmtd/mgmt_be_nb.c
-new file mode 100644
-index 000000000000..613272d40728
---- /dev/null
-+++ b/mgmtd/mgmt_be_nb.c
-@@ -0,0 +1,6 @@
-+// SPDX-License-Identifier: GPL-2.0-or-later
-+
-+#include "config.h"
-+#include "xref.h"
-+
-+XREF_SETUP();
-diff --git a/mgmtd/subdir.am b/mgmtd/subdir.am
-index 5182c4a47d37..14544c4f0507 100644
---- a/mgmtd/subdir.am
-+++ b/mgmtd/subdir.am
-@@ -16,6 +16,7 @@ clippy_scan += \
-
- lib_LTLIBRARIES += mgmtd/libmgmt_be_nb.la
- mgmtd_libmgmt_be_nb_la_SOURCES = \
-+ mgmtd/mgmt_be_nb.c \
- zebra/zebra_cli.c \
- # end
- nodist_mgmtd_libmgmt_be_nb_la_SOURCES = \
-diff --git a/qpb/qpb.c b/qpb/qpb.c
-index 63454f115666..625817857819 100644
---- a/qpb/qpb.c
-+++ b/qpb/qpb.c
-@@ -10,3 +10,8 @@
- /*
- * Main file for the qpb library.
- */
-+
-+#include "config.h"
-+#include "xref.h"
-+
-+XREF_SETUP();
---
-2.43.0
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2e44dfb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-add-XREF_SETUP-to-libraries-and-utilites.patch