bug-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Add a patch to remove symbol duplication with rumpnet


From: Etienne Brateau
Subject: [PATCH] Add a patch to remove symbol duplication with rumpnet
Date: Thu, 2 May 2024 23:40:25 +0200

The symbol was declared twice so when trying to use the libraries, the
linker would fail due to multiple symbols with the same names. Theses
declarations appears in:
- buildrump.sh/src/sys/net/if.c
- buildrump.sh/src/sys/rump/librump/rumpnet/net_stub.c
---
 ...umpnet_remove_struct_declaration_duplication.diff | 12 ++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 
debian/patches/rumpnet_remove_struct_declaration_duplication.diff

diff --git a/debian/patches/rumpnet_remove_struct_declaration_duplication.diff 
b/debian/patches/rumpnet_remove_struct_declaration_duplication.diff
new file mode 100644
index 00000000..3367b402
--- /dev/null
+++ b/debian/patches/rumpnet_remove_struct_declaration_duplication.diff
@@ -0,0 +1,12 @@
+Index: rumpkernel/buildrump.sh/src/sys/rump/librump/rumpnet/net_stub.c
+===================================================================
+--- rumpkernel.orig/buildrump.sh/src/sys/rump/librump/rumpnet/net_stub.c
++++ rumpkernel/buildrump.sh/src/sys/rump/librump/rumpnet/net_stub.c
+@@ -120,7 +120,3 @@ __weak_alias(in6mask0,rumpnet_stub);
+ __weak_alias(altq_detach,rumpnet_stub);
+ __weak_alias(altq_disable,rumpnet_stub);
+ __weak_alias(tbr_dequeue,rumpnet_stub);
+-
+-struct ifnet_head ifnet_list;
+-struct pslist_head ifnet_pslist;
+-kmutex_t ifnet_mtx;
diff --git a/debian/patches/series b/debian/patches/series
index 6316af91..f9c6bba1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ PAE
 vm_allocate_contiguous_align
 err
 vm_pages_phys.diff
+rumpnet_remove_struct_declaration_duplication.diff
-- 
2.43.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]