From e5b05ab3d0b711701109678ce8570250d199d9b9 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 11 Jan 2022 14:46:37 -0500 Subject: [PATCH] Rename libcommon.so to libcommon-gpl.so MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit libcommon is a static library is currently used by both liblttng-ctl (LGPLv2.1) and all lttng-tools executables (GPLv2). Given that some code in libcommon depends on liburcu, this introduces an indirect dependency from liblttng-ctl to liburcu, which is unwanted. This first step renames libcommon.so to libcommon-gpl.so. Following steps will introduce a more lightweight libcommon-lgpl.so which only contains LGPLv2.1 code, and removes the dependency on liburcu. Backport Notes -------------- ini_config has to link against liblttng-ctl since since the internal configuration library is not split into ini-config and libconfig (see 3299fd310). Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau Change-Id: Ia8f37ea229f68550200cbb1528216a505bbbd45f --- extras/bindings/swig/python/Makefile.am | 2 +- src/bin/lttng-consumerd/Makefile.am | 2 +- src/bin/lttng-crash/Makefile.am | 2 +- src/bin/lttng-relayd/Makefile.am | 2 +- src/bin/lttng-sessiond/Makefile.am | 2 +- src/bin/lttng/Makefile.am | 2 +- src/common/Makefile.am | 10 ++--- src/lib/lttng-ctl/Makefile.am | 2 +- tests/regression/tools/health/Makefile.am | 2 +- tests/regression/tools/live/Makefile.am | 2 +- .../regression/tools/notification/Makefile.am | 6 +-- tests/unit/Makefile.am | 44 +++++++++---------- tests/unit/ini_config/Makefile.am | 8 ++-- 13 files changed, 43 insertions(+), 43 deletions(-) diff --git a/extras/bindings/swig/python/Makefile.am b/extras/bindings/swig/python/Makefile.am index 209f5bd61..73428d9be 100644 --- a/extras/bindings/swig/python/Makefile.am +++ b/extras/bindings/swig/python/Makefile.am @@ -22,7 +22,7 @@ nodist__lttng_la_SOURCES = lttng_wrap.c _lttng_la_LDFLAGS = -module _lttng_la_LIBADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ - $(top_builddir)/src/common/libcommon.la + $(top_builddir)/src/common/libcommon-gpl.la lttng_wrap.c: lttng.i $(SWIG) -python -I. -I$(top_srcdir)/src/common/sessiond-comm lttng.i diff --git a/src/bin/lttng-consumerd/Makefile.am b/src/bin/lttng-consumerd/Makefile.am index 112e360d0..5704ee721 100644 --- a/src/bin/lttng-consumerd/Makefile.am +++ b/src/bin/lttng-consumerd/Makefile.am @@ -10,7 +10,7 @@ lttng_consumerd_SOURCES = lttng-consumerd.c \ lttng_consumerd_LDADD = \ $(top_builddir)/src/common/consumer/libconsumer.la \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/common/index/libindex.la \ $(top_builddir)/src/common/health/libhealth.la \ $(top_builddir)/src/common/testpoint/libtestpoint.la diff --git a/src/bin/lttng-crash/Makefile.am b/src/bin/lttng-crash/Makefile.am index 9c320bb15..08b86af8c 100644 --- a/src/bin/lttng-crash/Makefile.am +++ b/src/bin/lttng-crash/Makefile.am @@ -10,5 +10,5 @@ bin_PROGRAMS = lttng-crash lttng_crash_SOURCES = lttng-crash.c -lttng_crash_LDADD = $(top_builddir)/src/common/libcommon.la \ +lttng_crash_LDADD = $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/common/config/libconfig.la diff --git a/src/bin/lttng-relayd/Makefile.am b/src/bin/lttng-relayd/Makefile.am index f6d5b2950..d22484ad0 100644 --- a/src/bin/lttng-relayd/Makefile.am +++ b/src/bin/lttng-relayd/Makefile.am @@ -29,7 +29,7 @@ lttng_relayd_SOURCES = main.c lttng-relayd.h utils.h utils.c cmd.h \ # link on liblttngctl for check if relayd is already alive. lttng_relayd_LDADD = $(URCU_LIBS) \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ $(top_builddir)/src/common/hashtable/libhashtable.la \ $(top_builddir)/src/common/compat/libcompat.la \ diff --git a/src/bin/lttng-sessiond/Makefile.am b/src/bin/lttng-sessiond/Makefile.am index 11fb85e0b..13eb24e9b 100644 --- a/src/bin/lttng-sessiond/Makefile.am +++ b/src/bin/lttng-sessiond/Makefile.am @@ -73,7 +73,7 @@ liblttng_sessiond_common_la_LIBADD = $(URCU_LIBS) $(KMOD_LIBS) \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ $(top_builddir)/src/common/kernel-ctl/libkernel-ctl.la \ $(top_builddir)/src/common/hashtable/libhashtable.la \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/common/compat/libcompat.la \ $(top_builddir)/src/common/relayd/librelayd.la \ $(top_builddir)/src/common/testpoint/libtestpoint.la \ diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am index 7de01c292..f7e786b1f 100644 --- a/src/bin/lttng/Makefile.am +++ b/src/bin/lttng/Makefile.am @@ -39,7 +39,7 @@ lttng_SOURCES = command.h conf.c conf.h commands/start.c \ lttng_CFLAGS = $(AM_CFLAGS) $(POPT_CFLAGS) lttng_LDADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/common/config/libconfig.la \ $(top_builddir)/src/common/string-utils/libstring-utils.la \ $(top_builddir)/src/common/filter/libfilter.la \ diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 2835e9f92..ba35170d9 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -36,10 +36,10 @@ DIST_SUBDIRS = \ argpar-utils # Common library -noinst_LTLIBRARIES = libcommon.la +noinst_LTLIBRARIES = libcommon-gpl.la EXTRA_DIST = mi-lttng-4.1.xsd -libcommon_la_SOURCES = \ +libcommon_gpl_la_SOURCES = \ actions/action.c \ actions/list.c \ actions/notify.c \ @@ -113,11 +113,11 @@ libcommon_la_SOURCES = \ waiter.c waiter.h if HAVE_ELF_H -libcommon_la_SOURCES += \ +libcommon_gpl_la_SOURCES += \ lttng-elf.c lttng-elf.h endif -libcommon_la_LIBADD = \ +libcommon_gpl_la_LIBADD = \ $(top_builddir)/src/common/bytecode/libbytecode.la \ $(top_builddir)/src/common/config/libconfig.la \ $(top_builddir)/src/common/compat/libcompat.la \ @@ -179,7 +179,7 @@ noinst_HEADERS = \ noinst_PROGRAMS = filter-grammar-test filter_grammar_test_SOURCES = filter-grammar-test.c filter_grammar_test_LDADD = \ - libcommon.la + libcommon-gpl.la all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ diff --git a/src/lib/lttng-ctl/Makefile.am b/src/lib/lttng-ctl/Makefile.am index 8c271f5ef..c8525260e 100644 --- a/src/lib/lttng-ctl/Makefile.am +++ b/src/lib/lttng-ctl/Makefile.am @@ -16,7 +16,7 @@ liblttng_ctl_la_LDFLAGS = \ liblttng_ctl_la_LIBADD = \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ - $(top_builddir)/src/common/libcommon.la + $(top_builddir)/src/common/libcommon-gpl.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = lttng-ctl.pc diff --git a/tests/regression/tools/health/Makefile.am b/tests/regression/tools/health/Makefile.am index d3821ec06..da0d5f580 100644 --- a/tests/regression/tools/health/Makefile.am +++ b/tests/regression/tools/health/Makefile.am @@ -34,7 +34,7 @@ noinst_LTLIBRARIES = libhealthstall.la libhealthtpfail.la health_check_SOURCES = health_check.c $(UTILS) health_check_LDADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(DL_LIBS) EXTRA_DIST = $(COPYSCRIPTS) diff --git a/tests/regression/tools/live/Makefile.am b/tests/regression/tools/live/Makefile.am index 1587deb12..7248245e9 100644 --- a/tests/regression/tools/live/Makefile.am +++ b/tests/regression/tools/live/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir) LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la -LIBCOMMON=$(top_builddir)/src/common/libcommon.la +LIBCOMMON_GPL=$(top_builddir)/src/common/libcommon-gpl.la LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la LIBRELAYD=$(top_builddir)/src/common/relayd/librelayd.la diff --git a/tests/regression/tools/notification/Makefile.am b/tests/regression/tools/notification/Makefile.am index b9e4b8ac2..b4033d5c4 100644 --- a/tests/regression/tools/notification/Makefile.am +++ b/tests/regression/tools/notification/Makefile.am @@ -38,14 +38,14 @@ FORCE_SHARED_LIB_OPTIONS = -module -shared -avoid-version \ libpause_consumer_la_SOURCES = consumer_testpoints.c libpause_consumer_la_LIBADD = \ $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(DL_LIBS) libpause_consumer_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS) libpause_sessiond_la_SOURCES = sessiond_testpoints.c libpause_sessiond_la_LIBADD = \ - $(top_builddir)/src/common/libcommon.la \ + $(top_builddir)/src/common/libcommon-gpl.la \ $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \ $(DL_LIBS) libpause_sessiond_la_LDFLAGS = $(FORCE_SHARED_LIB_OPTIONS) @@ -63,7 +63,7 @@ rotation_SOURCES = rotation.c rotation_LDADD = $(LIB_LTTNG_CTL) $(LIBTAP) -lm default_pipe_size_getter_SOURCES = default_pipe_size_getter.c -default_pipe_size_getter_LDADD = $(top_builddir)/src/common/libcommon.la +default_pipe_size_getter_LDADD = $(top_builddir)/src/common/libcommon-gpl.la noinst_SCRIPTS = \ test_notification_kernel_buffer_usage \ diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 7ff30d266..a07643206 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -36,7 +36,7 @@ TESTS = \ LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la -LIBCOMMON=$(top_builddir)/src/common/libcommon.la +LIBCOMMON_GPL=$(top_builddir)/src/common/libcommon-gpl.la LIBSTRINGUTILS=$(top_builddir)/src/common/string-utils/libstring-utils.la LIBFDTRACKER=$(top_builddir)/src/common/fd-tracker/libfd-tracker.la LIBSESSIOND_COMM=$(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la @@ -79,7 +79,7 @@ endif # URI unit tests test_uri_SOURCES = test_uri.c -test_uri_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBHASHTABLE) $(DL_LIBS) +test_uri_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBHASHTABLE) $(DL_LIBS) RELAYD_OBJS = $(top_builddir)/src/bin/lttng-relayd/backward-compatibility-group-by.$(OBJEXT) @@ -104,33 +104,33 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBLTTNG_SESSIOND_COMMON) $(DL_LIBS) # parse_size_suffix unit test test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c -test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) +test_utils_parse_size_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON_GPL) $(DL_LIBS) # parse_time_suffix unit test test_utils_parse_time_suffix_SOURCES = test_utils_parse_time_suffix.c -test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) +test_utils_parse_time_suffix_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON_GPL) # compat_poll unit test test_utils_compat_poll_SOURCES = test_utils_compat_poll.c test_utils_compat_poll_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(DL_LIBS) \ - $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON) + $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON_GPL) # compat_pthread unit test test_utils_compat_pthread_SOURCES = test_utils_compat_pthread.c test_utils_compat_pthread_LDADD = $(LIBTAP) \ - $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON) + $(top_builddir)/src/common/compat/libcompat.la $(LIBCOMMON_GPL) # expand_path unit test test_utils_expand_path_SOURCES = test_utils_expand_path.c -test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) +test_utils_expand_path_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON_GPL) $(DL_LIBS) # directory handle unit test test_directory_handle_SOURCES = test_directory_handle.c -test_directory_handle_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON) $(DL_LIBS) +test_directory_handle_LDADD = $(LIBTAP) $(LIBHASHTABLE) $(LIBCOMMON_GPL) $(DL_LIBS) # string utilities unit test test_string_utils_SOURCES = test_string_utils.c -test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBSTRINGUTILS) $(DL_LIBS) +test_string_utils_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBSTRINGUTILS) $(DL_LIBS) # Notification api test_notification_SOURCES = test_notification.c @@ -138,55 +138,55 @@ test_notification_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(DL_LIBS) # Event rule api test_event_rule_SOURCES = test_event_rule.c -test_event_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) \ +test_event_rule_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) \ $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT) # Condition api test_condition_SOURCES = test_condition.c -test_condition_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) +test_condition_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) # relayd backward compat for groou-by-session utilities test_relayd_backward_compat_group_by_session_SOURCES = test_relayd_backward_compat_group_by_session.c -test_relayd_backward_compat_group_by_session_LDADD = $(LIBTAP) $(LIBCOMMON) $(RELAYD_OBJS) +test_relayd_backward_compat_group_by_session_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(RELAYD_OBJS) test_relayd_backward_compat_group_by_session_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/bin/lttng-relayd # rate policy object unit test test_rate_policy_SOURCES = test_rate_policy.c -test_rate_policy_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) \ +test_rate_policy_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) \ $(top_builddir)/src/bin/lttng/lttng-loglevel.$(OBJEXT) # fd tracker unit test test_fd_tracker_SOURCES = test_fd_tracker.c -test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON) $(LIBHASHTABLE) +test_fd_tracker_LDADD = $(LIBTAP) $(LIBFDTRACKER) $(DL_LIBS) $(URCU_LIBS) $(LIBCOMMON_GPL) $(LIBHASHTABLE) # uuid unit test test_uuid_SOURCES = test_uuid.c -test_uuid_LDADD = $(LIBTAP) $(LIBCOMMON) +test_uuid_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) # buffer view unit test test_buffer_view_SOURCES = test_buffer_view.c -test_buffer_view_LDADD = $(LIBTAP) $(LIBCOMMON) +test_buffer_view_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) # payload unit test test_payload_SOURCES = test_payload.c -test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON) +test_payload_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON_GPL) # unix socket test test_unix_socket_SOURCES = test_unix_socket.c -test_unix_socket_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON) +test_unix_socket_LDADD = $(LIBTAP) $(LIBSESSIOND_COMM) $(LIBCOMMON_GPL) # Kernel probe location api test test_kernel_probe_SOURCES = test_kernel_probe.c -test_kernel_probe_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) +test_kernel_probe_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) # # Event expression to bytecode test test_event_expr_to_bytecode_SOURCES = test_event_expr_to_bytecode.c -test_event_expr_to_bytecode_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(LIBCOMMON) +test_event_expr_to_bytecode_LDADD = $(LIBTAP) $(LIBLTTNG_CTL) $(LIBCOMMON_GPL) # Log level rule api test_log_level_rule_SOURCES = test_log_level_rule.c -test_log_level_rule_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) +test_log_level_rule_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) # Action api test_action_SOURCES = test_action.c -test_action_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBLTTNG_CTL) $(DL_LIBS) +test_action_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(DL_LIBS) diff --git a/tests/unit/ini_config/Makefile.am b/tests/unit/ini_config/Makefile.am index 7f15f99c9..080b39ea3 100644 --- a/tests/unit/ini_config/Makefile.am +++ b/tests/unit/ini_config/Makefile.am @@ -3,16 +3,16 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la -LIBCONFIG=$(top_builddir)/src/common/config/libconfig.la -LIBCOMMON=$(top_builddir)/src/common/libcommon.la +LIBCOMMON_GPL=$(top_builddir)/src/common/libcommon-gpl.la LIBHASHTABLE=$(top_builddir)/src/common/hashtable/libhashtable.la +LIBLTTNG_CTL=$(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la noinst_PROGRAMS = ini_config EXTRA_DIST = test_ini_config sample.ini ini_config_SOURCES = ini_config.c -ini_config_LDADD = $(LIBTAP) $(LIBCONFIG) $(LIBCOMMON) $(LIBHASHTABLE) \ - $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la +ini_config_LDADD = $(LIBTAP) $(LIBCOMMON_GPL) $(LIBLTTNG_CTL) $(LIBHASHTABLE) + all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ -- 2.34.1