Thanks, applied as bb8b42f77ba3452318c6b094d054622bd68b6076. Michael
[sent from post-receive hook] On Mon, 18 May 2026 09:53:54 +0200, Thorsten Scherer <[email protected]> wrote: > Signed-off-by: Thorsten Scherer <[email protected]> > Message-Id: <[email protected]> > [mol: remove dependencies in netsniff-ng] > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/liburcu.in b/rules/liburcu.in > deleted file mode 100644 > index 3b32c7da2fc6..000000000000 > --- a/rules/liburcu.in > +++ /dev/null > @@ -1,31 +0,0 @@ > -## SECTION=staging > -## old section: > -### SECTION=system_libraries > - > -menuconfig LIBURCU > - tristate > - prompt "liburcu " > - select GLIBC_PTHREAD > - help > - liburcu is an LGPLv2.1 userspace RCU (read-copy-update) library. This > - data synchronization library provides read-side access which scales > - linearly with the number of cores. It does so by allowing multiples > - copies of a given data structure to live at the same time, and by > - monitoring the data structure accesses to detect grace periods after > - which memory reclamation is possible. > - > - STAGING: remove in PTXdist 2026.03.0 > - Unmaintained in PTXdist and fails to build with current toolchains. > - Needs updating to the latest version. > - > -if LIBURCU > - > -config LIBURCU_SMP > - bool > - prompt "SMP support" > - default y > - help > - Provide SMP support. Warning: Disable this only on real uniprocessor > - systems. > - > -endif > diff --git a/rules/liburcu.make b/rules/liburcu.make > deleted file mode 100644 > index 5bab553d018c..000000000000 > --- a/rules/liburcu.make > +++ /dev/null > @@ -1,65 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2011 by Juergen Beisert <[email protected]> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_LIBURCU) += liburcu > - > -# > -# Paths and names > -# > -LIBURCU_VERSION := 0.9.3 > -LIBURCU_MD5 := 920970e35a1a2066c8353eabfeab8730 > -LIBURCU := userspace-rcu-$(LIBURCU_VERSION) > -LIBURCU_SUFFIX := tar.bz2 > -LIBURCU_URL := http://lttng.org/files/urcu/$(LIBURCU).$(LIBURCU_SUFFIX) > -LIBURCU_SOURCE := $(SRCDIR)/$(LIBURCU).$(LIBURCU_SUFFIX) > -LIBURCU_DIR := $(BUILDDIR)/$(LIBURCU) > -LIBURCU_LICENSE := LGPL-2.1-only > - > -# > ---------------------------------------------------------------------------- > -# Prepare > -# > ---------------------------------------------------------------------------- > - > -# > -# autoconf > -# > -LIBURCU_CONF_TOOL := autoconf > -LIBURCU_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --enable-shared \ > - --disable-static \ > - --$(call ptx/endis, PTXCONF_LIBURCU_SMP)-smp-support > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/liburcu.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, liburcu) > - @$(call install_fixup, liburcu,PRIORITY,optional) > - @$(call install_fixup, liburcu,SECTION,base) > - @$(call install_fixup, liburcu,AUTHOR,"Juergen Beisert > <[email protected]>") > - @$(call install_fixup, liburcu,DESCRIPTION,"Userspace RCU") > - > - @$(call install_lib, liburcu, 0, 0, 0644, liburcu) > - @$(call install_lib, liburcu, 0, 0, 0644, liburcu-bp) > - @$(call install_lib, liburcu, 0, 0, 0644, liburcu-cds) > - @$(call install_lib, liburcu, 0, 0, 0644, liburcu-common) > - @$(call install_lib, liburcu, 0, 0, 0644, liburcu-mb) > - @$(call install_lib, liburcu, 0, 0, 0644, liburcu-qsbr) > - @$(call install_lib, liburcu, 0, 0, 0644, liburcu-signal) > - > - @$(call install_finish, liburcu) > - > - @$(call touch) > - > -# vim: syntax=make > diff --git a/rules/netsniff-ng.in b/rules/netsniff-ng.in > index 0f4cb6b76b21..492e8df5539a 100644 > --- a/rules/netsniff-ng.in > +++ b/rules/netsniff-ng.in > @@ -2,13 +2,11 @@ > > menuconfig NETSNIFF_NG > tristate > - select LIBCLI if NETSNIFF_NG_MAUSEZAHN > select LIBNET if NETSNIFF_NG_MAUSEZAHN > select LIBNETFILTER_CONNTRACK if NETSNIFF_NG_FLOWTOP > select LIBNL3 if NETSNIFF_NG_LIBNL > select LIBPCAP if NETSNIFF_NG_MAUSEZAHN || > NETSNIFF_NG_NETSNIFF_NG > select LIBSODIUM if NETSNIFF_NG_CURVETUN > - select LIBURCU if NETSNIFF_NG_FLOWTOP > select NCURSES if NETSNIFF_NG_IFPPS || > NETSNIFF_NG_FLOWTOP > select ZLIB if NETSNIFF_NG_ZLIB > prompt "netsniff-ng " > @@ -38,7 +36,8 @@ config NETSNIFF_NG_CURVETUN > > config NETSNIFF_NG_FLOWTOP > bool > - depends on STAGING > + # needs liburcu > + depends on BROKEN > select NETSNIFF_NG_ZLIB > prompt "install flowtop" > > @@ -48,7 +47,8 @@ config NETSNIFF_NG_IFPPS > > config NETSNIFF_NG_MAUSEZAHN > bool > - depends on STAGING > + # needs libcli > + depends on BROKEN > prompt "install mausezahn" > > config NETSNIFF_NG_NETSNIFF_NG
