package/lttng-tools: remove no longer needed patch
PATCH 1/4 package/lttng-tools: remove no longer needed patch
This patch is already merged since the v2.7.0-rc1 version.
Signed-off-by Samuel Martin <[email protected]>
--- ...-and-Config-string-declarations-as-extern.patch | 443 --------------------- 1 file changed, 443 deletions(-) delete mode 100644 package/lttng-tools/0001-Fix-Mark-MI-and-Config-string-declarations-as-extern.patch
package/lttng-tools/0001-Fix-Mark-MI-and-Config-string-declarations-as-extern.patch deleted +0 -443
@@ -1,443 +0,0 @@ -From b369e4bfd0490739a66c65a56a30be8e1405e540 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= - <[email protected]> -Date: Fri, 22 May 2015 12:53:30 -0400 -Subject: [PATCH] Fix: Mark MI and Config string declarations as extern -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes a build issue with GCC 5.1 which would complain about -these symbols being defined multiple times. - -Signed-off-by: J?r?mie Galarneau <[email protected]> -[Thomas: backported on 2.6.0.] -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - src/common/config/config-session-abi.h | 166 +++++++++++++-------------- - src/common/mi-lttng.h | 198 ++++++++++++++++----------------- - 2 files changed, 182 insertions(+), 182 deletions(-) - -diff --git a/src/common/config/config-session-abi.h b/src/common/config/config-session-abi.h -index 1a1feec..e414a20 100644 ---- a/src/common/config/config-session-abi.h -+++ b/src/common/config/config-session-abi.h -@@ -18,95 +18,95 @@ - #ifndef CONFIG_SESSION_INTERNAL_H - #define CONFIG_SESSION_INTERNAL_H - --const char * const config_element_channel; --const char * const config_element_channels; --const char * const config_element_domain; --const char * const config_element_domains; --const char * const config_element_event; --const char * const config_element_events; --const char * const config_element_context; --const char * const config_element_contexts; --const char * const config_element_attributes; --const char * const config_element_exclusion; --const char * const config_element_exclusions; --const char * const config_element_function_attributes; --const char * const config_element_probe_attributes; --const char * const config_element_symbol_name; --const char * const config_element_address; --const char * const config_element_offset; --const char * const config_element_name; --const char * const config_element_enabled; --const char * const config_element_overwrite_mode; --const char * const config_element_subbuf_size; --const char * const config_element_num_subbuf; --const char * const config_element_switch_timer_interval; --const char * const config_element_read_timer_interval; --const char * const config_element_output; --const char * const config_element_output_type; --const char * const config_element_tracefile_size; --const char * const config_element_tracefile_count; --const char * const config_element_live_timer_interval; --const char * const config_element_type; --const char * const config_element_buffer_type; --const char * const config_element_session; --const char * const config_element_sessions; --const char * const config_element_perf; --const char * const config_element_config; --const char * const config_element_started; --const char * const config_element_snapshot_mode; --const char * const config_element_loglevel; --const char * const config_element_loglevel_type; --const char * const config_element_filter; --const char * const config_element_snapshot_outputs; --const char * const config_element_consumer_output; --const char * const config_element_destination; --const char * const config_element_path; --const char * const config_element_net_output; --const char * const config_element_control_uri; --const char * const config_element_data_uri; --const char * const config_element_max_size; -+extern const char * const config_element_channel; -+extern const char * const config_element_channels; -+extern const char * const config_element_domain; -+extern const char * const config_element_domains; -+extern const char * const config_element_event; -+extern const char * const config_element_events; -+extern const char * const config_element_context; -+extern const char * const config_element_contexts; -+extern const char * const config_element_attributes; -+extern const char * const config_element_exclusion; -+extern const char * const config_element_exclusions; -+extern const char * const config_element_function_attributes; -+extern const char * const config_element_probe_attributes; -+extern const char * const config_element_symbol_name; -+extern const char * const config_element_address; -+extern const char * const config_element_offset; -+extern const char * const config_element_name; -+extern const char * const config_element_enabled; -+extern const char * const config_element_overwrite_mode; -+extern const char * const config_element_subbuf_size; -+extern const char * const config_element_num_subbuf; -+extern const char * const config_element_switch_timer_interval; -+extern const char * const config_element_read_timer_interval; -+extern const char * const config_element_output; -+extern const char * const config_element_output_type; -+extern const char * const config_element_tracefile_size; -+extern const char * const config_element_tracefile_count; -+extern const char * const config_element_live_timer_interval; -+extern const char * const config_element_type; -+extern const char * const config_element_buffer_type; -+extern const char * const config_element_session; -+extern const char * const config_element_sessions; -+extern const char * const config_element_perf; -+extern const char * const config_element_config; -+extern const char * const config_element_started; -+extern const char * const config_element_snapshot_mode; -+extern const char * const config_element_loglevel; -+extern const char * const config_element_loglevel_type; -+extern const char * const config_element_filter; -+extern const char * const config_element_snapshot_outputs; -+extern const char * const config_element_consumer_output; -+extern const char * const config_element_destination; -+extern const char * const config_element_path; -+extern const char * const config_element_net_output; -+extern const char * const config_element_control_uri; -+extern const char * const config_element_data_uri; -+extern const char * const config_element_max_size; - --const char * const config_domain_type_kernel; --const char * const config_domain_type_ust; --const char * const config_domain_type_jul; --const char * const config_domain_type_log4j; -+extern const char * const config_domain_type_kernel; -+extern const char * const config_domain_type_ust; -+extern const char * const config_domain_type_jul; -+extern const char * const config_domain_type_log4j; - --const char * const config_buffer_type_per_pid; --const char * const config_buffer_type_per_uid; --const char * const config_buffer_type_global; -+extern const char * const config_buffer_type_per_pid; -+extern const char * const config_buffer_type_per_uid; -+extern const char * const config_buffer_type_global; - --const char * const config_overwrite_mode_discard; --const char * const config_overwrite_mode_overwrite; -+extern const char * const config_overwrite_mode_discard; -+extern const char * const config_overwrite_mode_overwrite; - --const char * const config_output_type_splice; --const char * const config_output_type_mmap; -+extern const char * const config_output_type_splice; -+extern const char * const config_output_type_mmap; - --const char * const config_loglevel_type_all; --const char * const config_loglevel_type_range; --const char * const config_loglevel_type_single; -+extern const char * const config_loglevel_type_all; -+extern const char * const config_loglevel_type_range; -+extern const char * const config_loglevel_type_single; - --const char * const config_event_type_all; --const char * const config_event_type_tracepoint; --const char * const config_event_type_probe; --const char * const config_event_type_function; --const char * const config_event_type_function_entry; --const char * const config_event_type_noop; --const char * const config_event_type_syscall; --const char * const config_event_type_kprobe; --const char * const config_event_type_kretprobe; -+extern const char * const config_event_type_all; -+extern const char * const config_event_type_tracepoint; -+extern const char * const config_event_type_probe; -+extern const char * const config_event_type_function; -+extern const char * const config_event_type_function_entry; -+extern const char * const config_event_type_noop; -+extern const char * const config_event_type_syscall; -+extern const char * const config_event_type_kprobe; -+extern const char * const config_event_type_kretprobe; - --const char * const config_event_context_pid; --const char * const config_event_context_procname; --const char * const config_event_context_prio; --const char * const config_event_context_nice; --const char * const config_event_context_vpid; --const char * const config_event_context_tid; --const char * const config_event_context_vtid; --const char * const config_event_context_ppid; --const char * const config_event_context_vppid; --const char * const config_event_context_pthread_id; --const char * const config_event_context_hostname; --const char * const config_event_context_ip; --const char * const config_event_context_perf_thread_counter; -+extern const char * const config_event_context_pid; -+extern const char * const config_event_context_procname; -+extern const char * const config_event_context_prio; -+extern const char * const config_event_context_nice; -+extern const char * const config_event_context_vpid; -+extern const char * const config_event_context_tid; -+extern const char * const config_event_context_vtid; -+extern const char * const config_event_context_ppid; -+extern const char * const config_event_context_vppid; -+extern const char * const config_event_context_pthread_id; -+extern const char * const config_event_context_hostname; -+extern const char * const config_event_context_ip; -+extern const char * const config_event_context_perf_thread_counter; - - #endif /* CONFIG_SESSION_INTERNAL_H */ -diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h -index a181e0b..06b0812 100644 ---- a/src/common/mi-lttng.h -+++ b/src/common/mi-lttng.h -@@ -49,133 +49,133 @@ struct mi_lttng_version { - }; - - /* Strings related to command */ --const char * const mi_lttng_element_command; --const char * const mi_lttng_element_command_action; --const char * const mi_lttng_element_command_add_context; --const char * const mi_lttng_element_command_calibrate; --const char * const mi_lttng_element_command_create; --const char * const mi_lttng_element_command_destroy; --const char * const mi_lttng_element_command_disable_channel; --const char * const mi_lttng_element_command_disable_event; --const char * const mi_lttng_element_command_enable_channels; --const char * const mi_lttng_element_command_enable_event; --const char * const mi_lttng_element_command_list; --const char * const mi_lttng_element_command_load; --const char * const mi_lttng_element_command_name; --const char * const mi_lttng_element_command_output; --const char * const mi_lttng_element_command_save; --const char * const mi_lttng_element_command_set_session; --const char * const mi_lttng_element_command_snapshot; --const char * const mi_lttng_element_command_snapshot_add; --const char * const mi_lttng_element_command_snapshot_del; --const char * const mi_lttng_element_command_snapshot_list; --const char * const mi_lttng_element_command_snapshot_record; --const char * const mi_lttng_element_command_start; --const char * const mi_lttng_element_command_stop; --const char * const mi_lttng_element_command_success; --const char * const mi_lttng_element_command_version; -+extern const char * const mi_lttng_element_command; -+extern const char * const mi_lttng_element_command_action; -+extern const char * const mi_lttng_element_command_add_context; -+extern const char * const mi_lttng_element_command_calibrate; -+extern const char * const mi_lttng_element_command_create; -+extern const char * const mi_lttng_element_command_destroy; -+extern const char * const mi_lttng_element_command_disable_channel; -+extern const char * const mi_lttng_element_command_disable_event; -+extern const char * const mi_lttng_element_command_enable_channels; -+extern const char * const mi_lttng_element_command_enable_event; -+extern const char * const mi_lttng_element_command_list; -+extern const char * const mi_lttng_element_command_load; -+extern const char * const mi_lttng_element_command_name; -+extern const char * const mi_lttng_element_command_output; -+extern const char * const mi_lttng_element_command_save; -+extern const char * const mi_lttng_element_command_set_session; -+extern const char * const mi_lttng_element_command_snapshot; -+extern const char * const mi_lttng_element_command_snapshot_add; -+extern const char * const mi_lttng_element_command_snapshot_del; -+extern const char * const mi_lttng_element_command_snapshot_list; -+extern const char * const mi_lttng_element_command_snapshot_record; -+extern const char * const mi_lttng_element_command_start; -+extern const char * const mi_lttng_element_command_stop; -+extern const char * const mi_lttng_element_command_success; -+extern const char * const mi_lttng_element_command_version; - - /* Strings related to version command */ --const char * const mi_lttng_element_version; --const char * const mi_lttng_element_version_commit; --const char * const mi_lttng_element_version_description; --const char * const mi_lttng_element_version_license; --const char * const mi_lttng_element_version_major; --const char * const mi_lttng_element_version_minor; --const char * const mi_lttng_element_version_patch_level; --const char * const mi_lttng_element_version_str; --const char * const mi_lttng_element_version_web; -+extern const char * const mi_lttng_element_version; -+extern const char * const mi_lttng_element_version_commit; -+extern const char * const mi_lttng_element_version_description; -+extern const char * const mi_lttng_element_version_license; -+extern const char * const mi_lttng_element_version_major; -+extern const char * const mi_lttng_element_version_minor; -+extern const char * const mi_lttng_element_version_patch_level; -+extern const char * const mi_lttng_element_version_str; -+extern const char * const mi_lttng_element_version_web; - - /* String related to a lttng_event_field */ --const char * const mi_lttng_element_event_field; --const char * const mi_lttng_element_event_fields; -+extern const char * const mi_lttng_element_event_field; -+extern const char * const mi_lttng_element_event_fields; - - /* String related to lttng_event_context */ --const char * const mi_lttng_context_type_perf_counter; --const char * const mi_lttng_context_type_perf_cpu_counter; --const char * const mi_lttng_context_type_perf_thread_counter; -+extern const char * const mi_lttng_context_type_perf_counter; -+extern const char * const mi_lttng_context_type_perf_cpu_counter; -+extern const char * const mi_lttng_context_type_perf_thread_counter; - - /* String related to lttng_event_perf_counter_ctx */ --const char * const mi_lttng_element_perf_counter_context; -+extern const char * const mi_lttng_element_perf_counter_context; - - /* Strings related to pid */ --const char * const mi_lttng_element_pids; --const char * const mi_lttng_element_pid; --const char * const mi_lttng_element_pid_id; -+extern const char * const mi_lttng_element_pids; -+extern const char * const mi_lttng_element_pid; -+extern const char * const mi_lttng_element_pid_id; - - /* Strings related to save command */ --const char * const mi_lttng_element_save; -+extern const char * const mi_lttng_element_save; - - /* Strings related to load command */ --const char * const mi_lttng_element_load; -+extern const char * const mi_lttng_element_load; - - /* General element of mi_lttng */ --const char * const mi_lttng_element_empty; --const char * const mi_lttng_element_id; --const char * const mi_lttng_element_nowrite; --const char * const mi_lttng_element_success; --const char * const mi_lttng_element_type_enum; --const char * const mi_lttng_element_type_float; --const char * const mi_lttng_element_type_integer; --const char * const mi_lttng_element_type_other; --const char * const mi_lttng_element_type_string; -+extern const char * const mi_lttng_element_empty; -+extern const char * const mi_lttng_element_id; -+extern const char * const mi_lttng_element_nowrite; -+extern const char * const mi_lttng_element_success; -+extern const char * const mi_lttng_element_type_enum; -+extern const char * const mi_lttng_element_type_float; -+extern const char * const mi_lttng_element_type_integer; -+extern const char * const mi_lttng_element_type_other; -+extern const char * const mi_lttng_element_type_string; - - /* String related to loglevel */ --const char * const mi_lttng_loglevel_str_alert; --const char * const mi_lttng_loglevel_str_crit; --const char * const mi_lttng_loglevel_str_debug; --const char * const mi_lttng_loglevel_str_debug_function; --const char * const mi_lttng_loglevel_str_debug_line; --const char * const mi_lttng_loglevel_str_debug_module; --const char * const mi_lttng_loglevel_str_debug_process; --const char * const mi_lttng_loglevel_str_debug_program; --const char * const mi_lttng_loglevel_str_debug_system; --const char * const mi_lttng_loglevel_str_debug_unit; --const char * const mi_lttng_loglevel_str_emerg; --const char * const mi_lttng_loglevel_str_err; --const char * const mi_lttng_loglevel_str_info; --const char * const mi_lttng_loglevel_str_notice; --const char * const mi_lttng_loglevel_str_unknown; --const char * const mi_lttng_loglevel_str_warning; -+extern const char * const mi_lttng_loglevel_str_alert; -+extern const char * const mi_lttng_loglevel_str_crit; -+extern const char * const mi_lttng_loglevel_str_debug; -+extern const char * const mi_lttng_loglevel_str_debug_function; -+extern const char * const mi_lttng_loglevel_str_debug_line; -+extern const char * const mi_lttng_loglevel_str_debug_module; -+extern const char * const mi_lttng_loglevel_str_debug_process; -+extern const char * const mi_lttng_loglevel_str_debug_program; -+extern const char * const mi_lttng_loglevel_str_debug_system; -+extern const char * const mi_lttng_loglevel_str_debug_unit; -+extern const char * const mi_lttng_loglevel_str_emerg; -+extern const char * const mi_lttng_loglevel_str_err; -+extern const char * const mi_lttng_loglevel_str_info; -+extern const char * const mi_lttng_loglevel_str_notice; -+extern const char * const mi_lttng_loglevel_str_unknown; -+extern const char * const mi_lttng_loglevel_str_warning; - - /* String related to loglevel JUL */ --const char * const mi_lttng_loglevel_str_jul_all; --const char * const mi_lttng_loglevel_str_jul_config; --const char * const mi_lttng_loglevel_str_jul_fine; --const char * const mi_lttng_loglevel_str_jul_finer; --const char * const mi_lttng_loglevel_str_jul_finest; --const char * const mi_lttng_loglevel_str_jul_info; --const char * const mi_lttng_loglevel_str_jul_off; --const char * const mi_lttng_loglevel_str_jul_severe; --const char * const mi_lttng_loglevel_str_jul_warning; -+extern const char * const mi_lttng_loglevel_str_jul_all; -+extern const char * const mi_lttng_loglevel_str_jul_config; -+extern const char * const mi_lttng_loglevel_str_jul_fine; -+extern const char * const mi_lttng_loglevel_str_jul_finer; -+extern const char * const mi_lttng_loglevel_str_jul_finest; -+extern const char * const mi_lttng_loglevel_str_jul_info; -+extern const char * const mi_lttng_loglevel_str_jul_off; -+extern const char * const mi_lttng_loglevel_str_jul_severe; -+extern const char * const mi_lttng_loglevel_str_jul_warning; - - /* String related to loglevel Log4j */ --const char * const mi_lttng_loglevel_str_log4j_off; --const char * const mi_lttng_loglevel_str_log4j_fatal; --const char * const mi_lttng_loglevel_str_log4j_error; --const char * const mi_lttng_loglevel_str_log4j_warn; --const char * const mi_lttng_loglevel_str_log4j_info; --const char * const mi_lttng_loglevel_str_log4j_debug; --const char * const mi_lttng_loglevel_str_log4j_trace; --const char * const mi_lttng_loglevel_str_log4j_all; -+extern const char * const mi_lttng_loglevel_str_log4j_off; -+extern const char * const mi_lttng_loglevel_str_log4j_fatal; -+extern const char * const mi_lttng_loglevel_str_log4j_error; -+extern const char * const mi_lttng_loglevel_str_log4j_warn; -+extern const char * const mi_lttng_loglevel_str_log4j_info; -+extern const char * const mi_lttng_loglevel_str_log4j_debug; -+extern const char * const mi_lttng_loglevel_str_log4j_trace; -+extern const char * const mi_lttng_loglevel_str_log4j_all; - - /* String related to loglevel type */ --const char * const mi_lttng_loglevel_type_all; --const char * const mi_lttng_loglevel_type_range; --const char * const mi_lttng_loglevel_type_single; --const char * const mi_lttng_loglevel_type_unknown; -+extern const char * const mi_lttng_loglevel_type_all; -+extern const char * const mi_lttng_loglevel_type_range; -+extern const char * const mi_lttng_loglevel_type_single; -+extern const char * const mi_lttng_loglevel_type_unknown; - - /* Sting related to lttng_calibrate */ --const char * const mi_lttng_element_calibrate; --const char * const mi_lttng_element_calibrate_function; -+extern const char * const mi_lttng_element_calibrate; -+extern const char * const mi_lttng_element_calibrate_function; - - /* String related to a lttng_snapshot */ --const char * const mi_lttng_element_snapshot_ctrl_url; --const char * const mi_lttng_element_snapshot_data_url; --const char * const mi_lttng_element_snapshot_max_size; --const char * const mi_lttng_element_snapshot_n_ptr; --const char * const mi_lttng_element_snapshot_session_name; --const char * const mi_lttng_element_snapshots; -+extern const char * const mi_lttng_element_snapshot_ctrl_url; -+extern const char * const mi_lttng_element_snapshot_data_url; -+extern const char * const mi_lttng_element_snapshot_max_size; -+extern const char * const mi_lttng_element_snapshot_n_ptr; -+extern const char * const mi_lttng_element_snapshot_session_name; -+extern const char * const mi_lttng_element_snapshots; - - /* Utility string function */ - const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain); --- -2.6.3 -
Signature · 1 line
2.6.2
PATCH 2/4 package/lttng-tools: fix static build
Add patch fixing configure.ac for library detection on static build.
Fixes:
http://autobuild.buildroot.net/results/0f1/0f1e015a0c5a5ac2beeb5011d31a1e0058a32a0d/
Upstream status: Merged
Signed-off-by Samuel Martin <[email protected]>
--- .../0001-configure.ac-fix-static-build.patch | 54 ++++++++++++++++++++++ package/lttng-tools/lttng-tools.mk | 2 + 2 files changed, 56 insertions(+) create mode 100644 package/lttng-tools/0001-configure.ac-fix-static-build.patch
package/lttng-tools/0001-configure.ac-fix-static-build.patch new file +54 -0
@@ -0,0 +1,54 @@ +Upstream status: merged +From 75df93099f6fc18ddd1599efd1313d5260c4d49a Mon Sep 17 00:00:00 2001 +From: Samuel Martin <[email protected]> +Date: Sun, 22 Nov 2015 23:38:00 +0100 +Subject: [PATCH] configure.ac: fix static build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For static build, some extra LDFLAGS may be needed. + +Using PKG_CHECK_MODULES instead of AC_CHECK_LIB for librairy detection +allows to get all these flags. Then, the LIBS variable can be extended +with everything that is needed. + +So, use PKG_CHECK_MODULES for popt and uuid detection; which both depend +on libintl. + +This changes fixes build failures triggered with Buildroot, e.g.: + http://autobuild.buildroot.net/results/0f1/0f1e015a0c5a5ac2beeb5011d31a1e0058a32a0d/build-end.log + +Signed-off-by: Samuel Martin <[email protected]> +Signed-off-by: J?r?mie Galarneau <[email protected]> +--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4dee4b4..9208cb3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,15 +175,17 @@ AC_CHECK_LIB([pthread], [pthread_create], [], + ) + + # Check libpopt +-AC_CHECK_LIB([popt], [poptGetContext], [], ++PKG_CHECK_MODULES([POPT], [popt], ++ [LIBS="$LIBS $POPT_LIBS"], + [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])] + ) + + AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.)) + + # Check for libuuid +-AC_CHECK_LIB([uuid], [uuid_generate], ++PKG_CHECK_MODULES([UUID], [uuid], + [ ++ LIBS="$LIBS $UUID_LIBS" + AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.]) + have_libuuid=yes + ], +-- +2.6.2 +
package/lttng-tools/lttng-tools.mk +2 -0
@@ -10,6 +10,8 @@ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/* LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr +# Need autoreconf because of a patch touching configure.ac +LTTNG_TOOLS_AUTORECONF = YES # The host-lttng-babeltrace technically isn't a required build # dependency. However, having the babeltrace utilities built for the
Signature · 1 line
2.6.2
PATCH 2/4 package/lttng-tools: fix static build
Samuel, All,
On 2015-12-02 22:48 +0100, Samuel Martin spake thusly:
Quoted 8 lines
Add patch fixing configure.ac for library detection on static build.
Fixes:
http://autobuild.buildroot.net/results/0f1/0f1e015a0c5a5ac2beeb5011d31a1e0058a32a0d/Upstream status: Merged
Signed-off-by Samuel Martin <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
See below for a minor comment...
Quoted 25 lines
--- .../0001-configure.ac-fix-static-build.patch | 54 ++++++++++++++++++++++ package/lttng-tools/lttng-tools.mk | 2 + 2 files changed, 56 insertions(+) create mode 100644 package/lttng-tools/0001-configure.ac-fix-static-build.patchpackage/lttng-tools/0001-configure.ac-fix-static-build.patch new file +13
-0@@ -0,0 +1,54 @@ +Upstream status: merged +From 75df93099f6fc18ddd1599efd1313d5260c4d49a Mon Sep 17 00:00:00 2001 +From: Samuel Martin <[email protected]> +Date: Sun, 22 Nov 2015 23:38:00 +0100 +Subject: [PATCH] configure.ac: fix static build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For static build, some extra LDFLAGS may be needed. + +Using PKG_CHECK_MODULES instead of AC_CHECK_LIB for librairy detection +allows to get all these flags. Then, the LIBS variable can be extended
package/lttng-tools/0001-configure.ac-fix-static-build.patch line 23
Quoted 10 lines
package/lttng-tools/0001-configure.ac-fix-static-build.patch new file +10
-0+with everything that is needed. + +So, use PKG_CHECK_MODULES for popt and uuid detection; which both depend +on libintl. + +This changes fixes build failures triggered with Buildroot, e.g.: + http://autobuild.buildroot.net/results/0f1/0f1e015a0c5a5ac2beeb5011d31a1e0058a32a0d/build-end.log + +Signed-off-by: Samuel Martin <[email protected]> +Signed-off-by: J?r?mie Galarneau <[email protected]>
It would have been good to poitn to the upstream commit:
https://git.lttng.org/?p=lttng-tools.git;a=commit;h=e9cee23a2e92694ba1347fd1242026d4c19413a8
Regards,
Yann E. MORIN.
Quoted 51 lines
package/lttng-tools/0001-configure.ac-fix-static-build.patch new file +31
-0+--- + configure.ac | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4dee4b4..9208cb3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,15 +175,17 @@ AC_CHECK_LIB([pthread], [pthread_create], [], + ) + + # Check libpopt +-AC_CHECK_LIB([popt], [poptGetContext], [], ++PKG_CHECK_MODULES([POPT], [popt], ++ [LIBS="$LIBS $POPT_LIBS"], + [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])] + ) + + AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.)) + + # Check for libuuid +-AC_CHECK_LIB([uuid], [uuid_generate], ++PKG_CHECK_MODULES([UUID], [uuid], + [ ++ LIBS="$LIBS $UUID_LIBS" + AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.]) + have_libuuid=yes + ], +-- +2.6.2 +package/lttng-tools/lttng-tools.mk +2
-0@@ -10,6 +10,8 @@ LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/* LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr +# Need autoreconf because of a patch touching configure.ac +LTTNG_TOOLS_AUTORECONF = YES # The host-lttng-babeltrace technically isn't a required build # dependency. However, having the babeltrace utilities built for theSignature · 6 lines
2.6.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 3/4 package/lttng-tools: backport patch fixing pthread_setname_np failure
In reply to Samuel MartinThis patch, backported from upstream, prevent the build from failing due to:
[...]
CCLD lttng-consumerd
../../../src/common/.libs/libcommon.a(runas.o): In function `run_as_worker':
/tmp/br/build/lttng-tools-2.7.0/src/common/runas.c:325: undefined reference to `pthread_setname_np'
collect2: error: ld returned 1 exit status
Makefile:475: recipe for target 'lttng-consumerd' failed
[...]
Signed-off-by Samuel Martin <[email protected]>
--- ...dependency-on-glibc-2.12-caused-by-pthrea.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/lttng-tools/0002-Fix-Remove-dependency-on-glibc-2.12-caused-by-pthrea.patch
package/lttng-tools/0002-Fix-Remove-dependency-on-glibc-2.12-caused-by-pthrea.patch new file +55 -0
@@ -0,0 +1,55 @@ +Upstream status: merged +From 8c40c9d05cca5c9fd6b98055cb26462bc0efdab2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= + <[email protected]> +Date: Wed, 30 Sep 2015 16:48:12 -0400 +Subject: [PATCH] Fix: Remove dependency on glibc 2.12 caused by + pthread_setname_np +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +prctl() can be used to set the same attribute set by +pthread_setname_np, but doesn't introduce a dependency on a newer +glibc. Using prctl(PR_SET_NAME) introduces a soft dependency on +Linux 2.6.9. However, the worker won't fail to launch if the call +fails as it is set out of convenience (debugger output). + +Signed-off-by: J?r?mie Galarneau <[email protected]> +Signed-off-by: Samuel Martin <[email protected]> +--- + src/common/runas.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/common/runas.c b/src/common/runas.c +index fc30a55..57f7382 100644 +--- a/src/common/runas.c ++++ b/src/common/runas.c +@@ -31,6 +31,7 @@ + #include <sched.h> + #include <sys/signal.h> + #include <assert.h> ++#include <sys/prctl.h> + + #include <common/common.h> + #include <common/utils.h> +@@ -322,12 +323,11 @@ int run_as_worker(struct run_as_worker *worker) + memset(worker->procname, 0, proc_orig_len); + strncpy(worker->procname, DEFAULT_RUN_AS_WORKER_NAME, proc_orig_len); + +- ret = pthread_setname_np(pthread_self(), DEFAULT_RUN_AS_WORKER_NAME); ++ ret = prctl(PR_SET_NAME, DEFAULT_RUN_AS_WORKER_NAME, 0, 0, 0); + if (ret) { +- errno = ret; +- ret = -1; +- PERROR("pthread_setname_np"); +- return EXIT_FAILURE; ++ /* Don't fail as this is not essential. */ ++ PERROR("prctl PR_SET_NAME"); ++ ret = 0; + } + + sendret.ret = 0; +-- +2.6.2 +
Signature · 1 line
2.6.2
PATCH 3/4 package/lttng-tools: backport patch fixing pthread_setname_np failure
Samuel, All,
On 2015-12-02 22:48 +0100, Samuel Martin spake thusly:
Quoted 11 lines
This patch, backported from upstream, prevent the build from failing due to:
[...]
CCLD lttng-consumerd
../../../src/common/.libs/libcommon.a(runas.o): In function `run_as_worker':
/tmp/br/build/lttng-tools-2.7.0/src/common/runas.c:325: undefined reference to `pthread_setname_np'
collect2: error: ld returned 1 exit status
Makefile:475: recipe for target 'lttng-consumerd' failed
[...]
Quoted 1 line
Signed-off-by Samuel Martin <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
Same comment as for patch 2:
https://git.lttng.org/?p=lttng-tools.git;a=commit;h=b8090274814e5f6a22cff0dd656e14769cc7a7df
Regards,
Yann E. MORIN.
Quoted 73 lines
--- ...dependency-on-glibc-2.12-caused-by-pthrea.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/lttng-tools/0002-Fix-Remove-dependency-on-glibc-2.12-caused-by-pthrea.patchpackage/lttng-tools/0002-Fix-Remove-dependency-on-glibc-2.12-caused-by-pthrea.patch new file +55
-0@@ -0,0 +1,55 @@ +Upstream status: merged +From 8c40c9d05cca5c9fd6b98055cb26462bc0efdab2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= + <[email protected]> +Date: Wed, 30 Sep 2015 16:48:12 -0400 +Subject: [PATCH] Fix: Remove dependency on glibc 2.12 caused by + pthread_setname_np +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +prctl() can be used to set the same attribute set by +pthread_setname_np, but doesn't introduce a dependency on a newer +glibc. Using prctl(PR_SET_NAME) introduces a soft dependency on +Linux 2.6.9. However, the worker won't fail to launch if the call +fails as it is set out of convenience (debugger output). + +Signed-off-by: J?r?mie Galarneau <[email protected]> +Signed-off-by: Samuel Martin <[email protected]> +--- + src/common/runas.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/common/runas.c b/src/common/runas.c +index fc30a55..57f7382 100644 +--- a/src/common/runas.c ++++ b/src/common/runas.c +@@ -31,6 +31,7 @@ + #include <sched.h> + #include <sys/signal.h> + #include <assert.h> ++#include <sys/prctl.h> + + #include <common/common.h> + #include <common/utils.h> +@@ -322,12 +323,11 @@ int run_as_worker(struct run_as_worker *worker) + memset(worker->procname, 0, proc_orig_len); + strncpy(worker->procname, DEFAULT_RUN_AS_WORKER_NAME, proc_orig_len); + +- ret = pthread_setname_np(pthread_self(), DEFAULT_RUN_AS_WORKER_NAME); ++ ret = prctl(PR_SET_NAME, DEFAULT_RUN_AS_WORKER_NAME, 0, 0, 0); + if (ret) { +- errno = ret; +- ret = -1; +- PERROR("pthread_setname_np"); +- return EXIT_FAILURE; ++ /* Don't fail as this is not essential. */ ++ PERROR("prctl PR_SET_NAME"); ++ ret = 0; + } + + sendret.ret = 0; +-- +2.6.2 +Signature · 6 lines
2.6.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 3/4 package/lttng-tools: backport patch fixing pthread_setname_np failure
Hi Yann,
Quoted 14 lines · Yann E. MORIN
Samuel, All,
On 2015-12-02 22:48 +0100, Samuel Martin spake thusly:
Quoted 11 lines
This patch, backported from upstream, prevent the build from failing due to:
[...]
CCLD lttng-consumerd
../../../src/common/.libs/libcommon.a(runas.o): In function `run_as_worker':
/tmp/br/build/lttng-tools-2.7.0/src/common/runas.c:325: undefined reference to `pthread_setname_np'
collect2: error: ld returned 1 exit status
Makefile:475: recipe for target 'lttng-consumerd' failed
[...]
Quoted 7 lines
Quoted 1 line
Signed-off-by Samuel Martin <[email protected]>Acked-by "Yann E. MORIN" <[email protected]>Same comment as for patch 2:
https://git.lttng.org/?p=lttng-tools.git;a=commit;h=b8090274814e5f6a22cff0dd656e14769cc7a7df
Thanks, I'll respin the series with the updates soon.
Regards,
Signature · 1 line
Samuel
PATCH 4/4 package/lttng-tools: fix static build
In reply to Samuel MartinSome unit tests depend on objects from src/common/.
This patch makes sure to points to the location of the non-PIC object files. Otherwise, in case of static only build, the PIC object are not built, so the link will fail.
Signed-off-by Samuel Martin <[email protected]>
--- ...0003-tests-unit-fix-object-files-location.patch | 90 ++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 package/lttng-tools/0003-tests-unit-fix-object-files-location.patch
package/lttng-tools/0003-tests-unit-fix-object-files-location.patch new file +90 -0
@@ -0,0 +1,90 @@ +Upstream status: submitted +Fetched from: https://lists.lttng.org/pipermail/lttng-dev/2015-December/025331.html +From 15b43f3b61adecb62ed6b297fa709313ada7bf89 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <[email protected]> +Date: Mon, 23 Nov 2015 00:11:36 +0100 +Subject: [PATCH] tests/unit: fix object files' location + +Referring to *.o files under a .libs/ directory is not recommended +because this belongs to libtool's innards. + +Indeed, libtool decides to place the *.o files in an +implementation-specific location: +- PIC *.o files go into a .libs/ directory; +- non-PIC *.o files are generated along side to their corresponding + source files. + +Using PIC objects to build executable is legit, thought it may +introduce some minor overhead at runtime. + +However, hard-coding these PIC object files in the Makefile.am to build +executables breaks the build in case of static only build. + +In this case, no PIC object files is generated, so the linker will not +found some of the needed objects files. + +Changing these dependencies' path fixes the static build, keeping the +shared one ok, though the non-PIC object files are now always built. + +Fixes #983. + +Fix tested on git master and v2.6 with no change needed. + +Signed-off-by: Samuel Martin <[email protected]> +--- + tests/unit/Makefile.am | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am +index c0c9c45..7bfe65a 100644 +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -34,9 +34,9 @@ SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.o \ + $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ + $(top_builddir)/src/bin/lttng-sessiond/utils.o \ + $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \ +- $(top_builddir)/src/common/.libs/uri.o \ +- $(top_builddir)/src/common/.libs/utils.o \ +- $(top_builddir)/src/common/.libs/error.o \ ++ $(top_builddir)/src/common/uri.o \ ++ $(top_builddir)/src/common/utils.o \ ++ $(top_builddir)/src/common/error.o \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la + +@@ -60,8 +60,8 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \ + $(top_builddir)/src/bin/lttng-sessiond/session.o \ + $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \ + $(top_builddir)/src/bin/lttng-sessiond/agent.o \ +- $(top_builddir)/src/common/.libs/uri.o \ +- $(top_builddir)/src/common/.libs/utils.o \ ++ $(top_builddir)/src/common/uri.o \ ++ $(top_builddir)/src/common/utils.o \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la + +@@ -75,8 +75,8 @@ endif + KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.o \ + $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ + $(top_builddir)/src/bin/lttng-sessiond/utils.o \ +- $(top_builddir)/src/common/.libs/uri.o \ +- $(top_builddir)/src/common/.libs/utils.o \ ++ $(top_builddir)/src/common/uri.o \ ++ $(top_builddir)/src/common/utils.o \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la + +@@ -86,8 +86,8 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) + test_kernel_data_LDADD += $(KERN_DATA_TRACE) + + # utils suffix for unit test +-UTILS_SUFFIX=$(top_builddir)/src/common/.libs/utils.o \ +- $(top_builddir)/src/common/.libs/runas.o ++UTILS_SUFFIX=$(top_builddir)/src/common/utils.o \ ++ $(top_builddir)/src/common/runas.o + + # parse_size_suffix unit test + test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c +-- +2.6.2 +
Signature · 1 line
2.6.2
PATCH 4/4 package/lttng-tools: fix static build
Samuel, All,
On 2015-12-02 22:48 +0100, Samuel Martin spake thusly:
Quoted 6 lines
Some unit tests depend on objects from src/common/.
This patch makes sure to points to the location of the non-PIC object files. Otherwise, in case of static only build, the PIC object are not built, so the link will fail.Signed-off-by Samuel Martin <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
This patch has now been accepted upstream:
https://git.lttng.org/?p=lttng-tools.git;a=commit;h=3622d7c3931685fab8d1b2e5585a369b78cefd12
Regards,
Yann E. MORIN.
Quoted 108 lines
--- ...0003-tests-unit-fix-object-files-location.patch | 90 ++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 package/lttng-tools/0003-tests-unit-fix-object-files-location.patchpackage/lttng-tools/0003-tests-unit-fix-object-files-location.patch new file +90
-0@@ -0,0 +1,90 @@ +Upstream status: submitted +Fetched from: https://lists.lttng.org/pipermail/lttng-dev/2015-December/025331.html +From 15b43f3b61adecb62ed6b297fa709313ada7bf89 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <[email protected]> +Date: Mon, 23 Nov 2015 00:11:36 +0100 +Subject: [PATCH] tests/unit: fix object files' location + +Referring to *.o files under a .libs/ directory is not recommended +because this belongs to libtool's innards. + +Indeed, libtool decides to place the *.o files in an +implementation-specific location: +- PIC *.o files go into a .libs/ directory; +- non-PIC *.o files are generated along side to their corresponding + source files. + +Using PIC objects to build executable is legit, thought it may +introduce some minor overhead at runtime. + +However, hard-coding these PIC object files in the Makefile.am to build +executables breaks the build in case of static only build. + +In this case, no PIC object files is generated, so the linker will not +found some of the needed objects files. + +Changing these dependencies' path fixes the static build, keeping the +shared one ok, though the non-PIC object files are now always built. + +Fixes #983. + +Fix tested on git master and v2.6 with no change needed. + +Signed-off-by: Samuel Martin <[email protected]> +--- + tests/unit/Makefile.am | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am +index c0c9c45..7bfe65a 100644 +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -34,9 +34,9 @@ SESSIONS=$(top_builddir)/src/bin/lttng-sessiond/session.o \ + $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ + $(top_builddir)/src/bin/lttng-sessiond/utils.o \ + $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \ +- $(top_builddir)/src/common/.libs/uri.o \ +- $(top_builddir)/src/common/.libs/utils.o \ +- $(top_builddir)/src/common/.libs/error.o \ ++ $(top_builddir)/src/common/uri.o \ ++ $(top_builddir)/src/common/utils.o \ ++ $(top_builddir)/src/common/error.o \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la + +@@ -60,8 +60,8 @@ UST_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-ust.o \ + $(top_builddir)/src/bin/lttng-sessiond/session.o \ + $(top_builddir)/src/bin/lttng-sessiond/snapshot.o \ + $(top_builddir)/src/bin/lttng-sessiond/agent.o \ +- $(top_builddir)/src/common/.libs/uri.o \ +- $(top_builddir)/src/common/.libs/utils.o \ ++ $(top_builddir)/src/common/uri.o \ ++ $(top_builddir)/src/common/utils.o \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la + +@@ -75,8 +75,8 @@ endif + KERN_DATA_TRACE=$(top_builddir)/src/bin/lttng-sessiond/trace-kernel.o \ + $(top_builddir)/src/bin/lttng-sessiond/consumer.o \ + $(top_builddir)/src/bin/lttng-sessiond/utils.o \ +- $(top_builddir)/src/common/.libs/uri.o \ +- $(top_builddir)/src/common/.libs/utils.o \ ++ $(top_builddir)/src/common/uri.o \ ++ $(top_builddir)/src/common/utils.o \ + $(top_builddir)/src/common/health/libhealth.la \ + $(top_builddir)/src/common/sessiond-comm/libsessiond-comm.la + +@@ -86,8 +86,8 @@ test_kernel_data_LDADD = $(LIBTAP) $(LIBCOMMON) $(LIBRELAYD) $(LIBSESSIOND_COMM) + test_kernel_data_LDADD += $(KERN_DATA_TRACE) + + # utils suffix for unit test +-UTILS_SUFFIX=$(top_builddir)/src/common/.libs/utils.o \ +- $(top_builddir)/src/common/.libs/runas.o ++UTILS_SUFFIX=$(top_builddir)/src/common/utils.o \ ++ $(top_builddir)/src/common/runas.o + + # parse_size_suffix unit test + test_utils_parse_size_suffix_SOURCES = test_utils_parse_size_suffix.c +-- +2.6.2 +Signature · 6 lines
2.6.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/4 package/lttng-tools: remove no longer needed patch
In reply to Samuel MartinQuoted 1 line · Samuel Martin
This patch is already merged since the v2.7.0-rc1 version.
Please add:
Fixes
http://autobuild.buildroot.net/results/0178e243eb27376d1507f1adde5d12bdbc0f352b
Quoted 1 line
Signed-off-by Samuel Martin <[email protected]>
Regards,
Arnout
[snip]
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
PATCH 1/4 package/lttng-tools: remove no longer needed patch
In reply to Samuel MartinSamuel, All,
On 2015-12-02 22:48 +0100, Samuel Martin spake thusly:
Quoted 3 lines
This patch is already merged since the v2.7.0-rc1 version.
Signed-off-by Samuel Martin <[email protected]>
Acked-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 461 lines
--- ...-and-Config-string-declarations-as-extern.patch | 443 --------------------- 1 file changed, 443 deletions(-) delete mode 100644 package/lttng-tools/0001-Fix-Mark-MI-and-Config-string-declarations-as-extern.patchpackage/lttng-tools/0001-Fix-Mark-MI-and-Config-string-declarations-as-extern.patch deleted +0
-443@@ -1,443 +0,0 @@ -From b369e4bfd0490739a66c65a56a30be8e1405e540 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= - <[email protected]> -Date: Fri, 22 May 2015 12:53:30 -0400 -Subject: [PATCH] Fix: Mark MI and Config string declarations as extern -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes a build issue with GCC 5.1 which would complain about -these symbols being defined multiple times. - -Signed-off-by: J?r?mie Galarneau <[email protected]> -[Thomas: backported on 2.6.0.] -Signed-off-by: Thomas Petazzoni <[email protected]> ---- - src/common/config/config-session-abi.h | 166 +++++++++++++-------------- - src/common/mi-lttng.h | 198 ++++++++++++++++----------------- - 2 files changed, 182 insertions(+), 182 deletions(-) - -diff --git a/src/common/config/config-session-abi.h b/src/common/config/config-session-abi.h -index 1a1feec..e414a20 100644 ---- a/src/common/config/config-session-abi.h -+++ b/src/common/config/config-session-abi.h -@@ -18,95 +18,95 @@ - #ifndef CONFIG_SESSION_INTERNAL_H - #define CONFIG_SESSION_INTERNAL_H - --const char * const config_element_channel; --const char * const config_element_channels; --const char * const config_element_domain; --const char * const config_element_domains; --const char * const config_element_event; --const char * const config_element_events; --const char * const config_element_context; --const char * const config_element_contexts; --const char * const config_element_attributes; --const char * const config_element_exclusion; --const char * const config_element_exclusions; --const char * const config_element_function_attributes; --const char * const config_element_probe_attributes; --const char * const config_element_symbol_name; --const char * const config_element_address; --const char * const config_element_offset; --const char * const config_element_name; --const char * const config_element_enabled; --const char * const config_element_overwrite_mode; --const char * const config_element_subbuf_size; --const char * const config_element_num_subbuf; --const char * const config_element_switch_timer_interval; --const char * const config_element_read_timer_interval; --const char * const config_element_output; --const char * const config_element_output_type; --const char * const config_element_tracefile_size; --const char * const config_element_tracefile_count; --const char * const config_element_live_timer_interval; --const char * const config_element_type; --const char * const config_element_buffer_type; --const char * const config_element_session; --const char * const config_element_sessions; --const char * const config_element_perf; --const char * const config_element_config; --const char * const config_element_started; --const char * const config_element_snapshot_mode; --const char * const config_element_loglevel; --const char * const config_element_loglevel_type; --const char * const config_element_filter; --const char * const config_element_snapshot_outputs; --const char * const config_element_consumer_output; --const char * const config_element_destination; --const char * const config_element_path; --const char * const config_element_net_output; --const char * const config_element_control_uri; --const char * const config_element_data_uri; --const char * const config_element_max_size; -+extern const char * const config_element_channel; -+extern const char * const config_element_channels; -+extern const char * const config_element_domain; -+extern const char * const config_element_domains; -+extern const char * const config_element_event; -+extern const char * const config_element_events; -+extern const char * const config_element_context; -+extern const char * const config_element_contexts; -+extern const char * const config_element_attributes; -+extern const char * const config_element_exclusion; -+extern const char * const config_element_exclusions; -+extern const char * const config_element_function_attributes; -+extern const char * const config_element_probe_attributes; -+extern const char * const config_element_symbol_name; -+extern const char * const config_element_address; -+extern const char * const config_element_offset; -+extern const char * const config_element_name; -+extern const char * const config_element_enabled; -+extern const char * const config_element_overwrite_mode; -+extern const char * const config_element_subbuf_size; -+extern const char * const config_element_num_subbuf; -+extern const char * const config_element_switch_timer_interval; -+extern const char * const config_element_read_timer_interval; -+extern const char * const config_element_output; -+extern const char * const config_element_output_type; -+extern const char * const config_element_tracefile_size; -+extern const char * const config_element_tracefile_count; -+extern const char * const config_element_live_timer_interval; -+extern const char * const config_element_type; -+extern const char * const config_element_buffer_type; -+extern const char * const config_element_session; -+extern const char * const config_element_sessions; -+extern const char * const config_element_perf; -+extern const char * const config_element_config; -+extern const char * const config_element_started; -+extern const char * const config_element_snapshot_mode; -+extern const char * const config_element_loglevel; -+extern const char * const config_element_loglevel_type; -+extern const char * const config_element_filter; -+extern const char * const config_element_snapshot_outputs; -+extern const char * const config_element_consumer_output; -+extern const char * const config_element_destination; -+extern const char * const config_element_path; -+extern const char * const config_element_net_output; -+extern const char * const config_element_control_uri; -+extern const char * const config_element_data_uri; -+extern const char * const config_element_max_size; - --const char * const config_domain_type_kernel; --const char * const config_domain_type_ust; --const char * const config_domain_type_jul; --const char * const config_domain_type_log4j; -+extern const char * const config_domain_type_kernel; -+extern const char * const config_domain_type_ust; -+extern const char * const config_domain_type_jul; -+extern const char * const config_domain_type_log4j; - --const char * const config_buffer_type_per_pid; --const char * const config_buffer_type_per_uid; --const char * const config_buffer_type_global; -+extern const char * const config_buffer_type_per_pid; -+extern const char * const config_buffer_type_per_uid; -+extern const char * const config_buffer_type_global; - --const char * const config_overwrite_mode_discard; --const char * const config_overwrite_mode_overwrite; -+extern const char * const config_overwrite_mode_discard; -+extern const char * const config_overwrite_mode_overwrite; - --const char * const config_output_type_splice; --const char * const config_output_type_mmap; -+extern const char * const config_output_type_splice; -+extern const char * const config_output_type_mmap; - --const char * const config_loglevel_type_all; --const char * const config_loglevel_type_range; --const char * const config_loglevel_type_single; -+extern const char * const config_loglevel_type_all; -+extern const char * const config_loglevel_type_range; -+extern const char * const config_loglevel_type_single; - --const char * const config_event_type_all; --const char * const config_event_type_tracepoint; --const char * const config_event_type_probe; --const char * const config_event_type_function; --const char * const config_event_type_function_entry; --const char * const config_event_type_noop; --const char * const config_event_type_syscall; --const char * const config_event_type_kprobe; --const char * const config_event_type_kretprobe; -+extern const char * const config_event_type_all; -+extern const char * const config_event_type_tracepoint; -+extern const char * const config_event_type_probe; -+extern const char * const config_event_type_function; -+extern const char * const config_event_type_function_entry; -+extern const char * const config_event_type_noop; -+extern const char * const config_event_type_syscall; -+extern const char * const config_event_type_kprobe; -+extern const char * const config_event_type_kretprobe; - --const char * const config_event_context_pid; --const char * const config_event_context_procname; --const char * const config_event_context_prio; --const char * const config_event_context_nice; --const char * const config_event_context_vpid; --const char * const config_event_context_tid; --const char * const config_event_context_vtid; --const char * const config_event_context_ppid; --const char * const config_event_context_vppid; --const char * const config_event_context_pthread_id; --const char * const config_event_context_hostname; --const char * const config_event_context_ip; --const char * const config_event_context_perf_thread_counter; -+extern const char * const config_event_context_pid; -+extern const char * const config_event_context_procname; -+extern const char * const config_event_context_prio; -+extern const char * const config_event_context_nice; -+extern const char * const config_event_context_vpid; -+extern const char * const config_event_context_tid; -+extern const char * const config_event_context_vtid; -+extern const char * const config_event_context_ppid; -+extern const char * const config_event_context_vppid; -+extern const char * const config_event_context_pthread_id; -+extern const char * const config_event_context_hostname; -+extern const char * const config_event_context_ip; -+extern const char * const config_event_context_perf_thread_counter; - - #endif /* CONFIG_SESSION_INTERNAL_H */ -diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h -index a181e0b..06b0812 100644 ---- a/src/common/mi-lttng.h -+++ b/src/common/mi-lttng.h -@@ -49,133 +49,133 @@ struct mi_lttng_version { - }; - - /* Strings related to command */ --const char * const mi_lttng_element_command; --const char * const mi_lttng_element_command_action; --const char * const mi_lttng_element_command_add_context; --const char * const mi_lttng_element_command_calibrate; --const char * const mi_lttng_element_command_create; --const char * const mi_lttng_element_command_destroy; --const char * const mi_lttng_element_command_disable_channel; --const char * const mi_lttng_element_command_disable_event; --const char * const mi_lttng_element_command_enable_channels; --const char * const mi_lttng_element_command_enable_event; --const char * const mi_lttng_element_command_list; --const char * const mi_lttng_element_command_load; --const char * const mi_lttng_element_command_name; --const char * const mi_lttng_element_command_output; --const char * const mi_lttng_element_command_save; --const char * const mi_lttng_element_command_set_session; --const char * const mi_lttng_element_command_snapshot; --const char * const mi_lttng_element_command_snapshot_add; --const char * const mi_lttng_element_command_snapshot_del; --const char * const mi_lttng_element_command_snapshot_list; --const char * const mi_lttng_element_command_snapshot_record; --const char * const mi_lttng_element_command_start; --const char * const mi_lttng_element_command_stop; --const char * const mi_lttng_element_command_success; --const char * const mi_lttng_element_command_version; -+extern const char * const mi_lttng_element_command; -+extern const char * const mi_lttng_element_command_action; -+extern const char * const mi_lttng_element_command_add_context; -+extern const char * const mi_lttng_element_command_calibrate; -+extern const char * const mi_lttng_element_command_create; -+extern const char * const mi_lttng_element_command_destroy; -+extern const char * const mi_lttng_element_command_disable_channel; -+extern const char * const mi_lttng_element_command_disable_event; -+extern const char * const mi_lttng_element_command_enable_channels; -+extern const char * const mi_lttng_element_command_enable_event; -+extern const char * const mi_lttng_element_command_list; -+extern const char * const mi_lttng_element_command_load; -+extern const char * const mi_lttng_element_command_name; -+extern const char * const mi_lttng_element_command_output; -+extern const char * const mi_lttng_element_command_save; -+extern const char * const mi_lttng_element_command_set_session; -+extern const char * const mi_lttng_element_command_snapshot; -+extern const char * const mi_lttng_element_command_snapshot_add; -+extern const char * const mi_lttng_element_command_snapshot_del; -+extern const char * const mi_lttng_element_command_snapshot_list; -+extern const char * const mi_lttng_element_command_snapshot_record; -+extern const char * const mi_lttng_element_command_start; -+extern const char * const mi_lttng_element_command_stop; -+extern const char * const mi_lttng_element_command_success; -+extern const char * const mi_lttng_element_command_version; - - /* Strings related to version command */ --const char * const mi_lttng_element_version; --const char * const mi_lttng_element_version_commit; --const char * const mi_lttng_element_version_description; --const char * const mi_lttng_element_version_license; --const char * const mi_lttng_element_version_major; --const char * const mi_lttng_element_version_minor; --const char * const mi_lttng_element_version_patch_level; --const char * const mi_lttng_element_version_str; --const char * const mi_lttng_element_version_web; -+extern const char * const mi_lttng_element_version; -+extern const char * const mi_lttng_element_version_commit; -+extern const char * const mi_lttng_element_version_description; -+extern const char * const mi_lttng_element_version_license; -+extern const char * const mi_lttng_element_version_major; -+extern const char * const mi_lttng_element_version_minor; -+extern const char * const mi_lttng_element_version_patch_level; -+extern const char * const mi_lttng_element_version_str; -+extern const char * const mi_lttng_element_version_web; - - /* String related to a lttng_event_field */ --const char * const mi_lttng_element_event_field; --const char * const mi_lttng_element_event_fields; -+extern const char * const mi_lttng_element_event_field; -+extern const char * const mi_lttng_element_event_fields; - - /* String related to lttng_event_context */ --const char * const mi_lttng_context_type_perf_counter; --const char * const mi_lttng_context_type_perf_cpu_counter; --const char * const mi_lttng_context_type_perf_thread_counter; -+extern const char * const mi_lttng_context_type_perf_counter; -+extern const char * const mi_lttng_context_type_perf_cpu_counter; -+extern const char * const mi_lttng_context_type_perf_thread_counter; - - /* String related to lttng_event_perf_counter_ctx */ --const char * const mi_lttng_element_perf_counter_context; -+extern const char * const mi_lttng_element_perf_counter_context; - - /* Strings related to pid */ --const char * const mi_lttng_element_pids; --const char * const mi_lttng_element_pid; --const char * const mi_lttng_element_pid_id; -+extern const char * const mi_lttng_element_pids; -+extern const char * const mi_lttng_element_pid; -+extern const char * const mi_lttng_element_pid_id; - - /* Strings related to save command */ --const char * const mi_lttng_element_save; -+extern const char * const mi_lttng_element_save; - - /* Strings related to load command */ --const char * const mi_lttng_element_load; -+extern const char * const mi_lttng_element_load; - - /* General element of mi_lttng */ --const char * const mi_lttng_element_empty; --const char * const mi_lttng_element_id; --const char * const mi_lttng_element_nowrite; --const char * const mi_lttng_element_success; --const char * const mi_lttng_element_type_enum; --const char * const mi_lttng_element_type_float; --const char * const mi_lttng_element_type_integer; --const char * const mi_lttng_element_type_other; --const char * const mi_lttng_element_type_string; -+extern const char * const mi_lttng_element_empty; -+extern const char * const mi_lttng_element_id; -+extern const char * const mi_lttng_element_nowrite; -+extern const char * const mi_lttng_element_success; -+extern const char * const mi_lttng_element_type_enum; -+extern const char * const mi_lttng_element_type_float; -+extern const char * const mi_lttng_element_type_integer; -+extern const char * const mi_lttng_element_type_other; -+extern const char * const mi_lttng_element_type_string; - - /* String related to loglevel */ --const char * const mi_lttng_loglevel_str_alert; --const char * const mi_lttng_loglevel_str_crit; --const char * const mi_lttng_loglevel_str_debug; --const char * const mi_lttng_loglevel_str_debug_function; --const char * const mi_lttng_loglevel_str_debug_line; --const char * const mi_lttng_loglevel_str_debug_module; --const char * const mi_lttng_loglevel_str_debug_process; --const char * const mi_lttng_loglevel_str_debug_program; --const char * const mi_lttng_loglevel_str_debug_system; --const char * const mi_lttng_loglevel_str_debug_unit; --const char * const mi_lttng_loglevel_str_emerg; --const char * const mi_lttng_loglevel_str_err; --const char * const mi_lttng_loglevel_str_info; --const char * const mi_lttng_loglevel_str_notice; --const char * const mi_lttng_loglevel_str_unknown; --const char * const mi_lttng_loglevel_str_warning; -+extern const char * const mi_lttng_loglevel_str_alert; -+extern const char * const mi_lttng_loglevel_str_crit; -+extern const char * const mi_lttng_loglevel_str_debug; -+extern const char * const mi_lttng_loglevel_str_debug_function; -+extern const char * const mi_lttng_loglevel_str_debug_line; -+extern const char * const mi_lttng_loglevel_str_debug_module; -+extern const char * const mi_lttng_loglevel_str_debug_process; -+extern const char * const mi_lttng_loglevel_str_debug_program; -+extern const char * const mi_lttng_loglevel_str_debug_system; -+extern const char * const mi_lttng_loglevel_str_debug_unit; -+extern const char * const mi_lttng_loglevel_str_emerg; -+extern const char * const mi_lttng_loglevel_str_err; -+extern const char * const mi_lttng_loglevel_str_info; -+extern const char * const mi_lttng_loglevel_str_notice; -+extern const char * const mi_lttng_loglevel_str_unknown; -+extern const char * const mi_lttng_loglevel_str_warning; - - /* String related to loglevel JUL */ --const char * const mi_lttng_loglevel_str_jul_all; --const char * const mi_lttng_loglevel_str_jul_config; --const char * const mi_lttng_loglevel_str_jul_fine; --const char * const mi_lttng_loglevel_str_jul_finer; --const char * const mi_lttng_loglevel_str_jul_finest; --const char * const mi_lttng_loglevel_str_jul_info; --const char * const mi_lttng_loglevel_str_jul_off; --const char * const mi_lttng_loglevel_str_jul_severe; --const char * const mi_lttng_loglevel_str_jul_warning; -+extern const char * const mi_lttng_loglevel_str_jul_all; -+extern const char * const mi_lttng_loglevel_str_jul_config; -+extern const char * const mi_lttng_loglevel_str_jul_fine; -+extern const char * const mi_lttng_loglevel_str_jul_finer; -+extern const char * const mi_lttng_loglevel_str_jul_finest; -+extern const char * const mi_lttng_loglevel_str_jul_info; -+extern const char * const mi_lttng_loglevel_str_jul_off; -+extern const char * const mi_lttng_loglevel_str_jul_severe; -+extern const char * const mi_lttng_loglevel_str_jul_warning; - - /* String related to loglevel Log4j */ --const char * const mi_lttng_loglevel_str_log4j_off; --const char * const mi_lttng_loglevel_str_log4j_fatal; --const char * const mi_lttng_loglevel_str_log4j_error; --const char * const mi_lttng_loglevel_str_log4j_warn; --const char * const mi_lttng_loglevel_str_log4j_info; --const char * const mi_lttng_loglevel_str_log4j_debug; --const char * const mi_lttng_loglevel_str_log4j_trace; --const char * const mi_lttng_loglevel_str_log4j_all; -+extern const char * const mi_lttng_loglevel_str_log4j_off; -+extern const char * const mi_lttng_loglevel_str_log4j_fatal; -+extern const char * const mi_lttng_loglevel_str_log4j_error; -+extern const char * const mi_lttng_loglevel_str_log4j_warn; -+extern const char * const mi_lttng_loglevel_str_log4j_info; -+extern const char * const mi_lttng_loglevel_str_log4j_debug; -+extern const char * const mi_lttng_loglevel_str_log4j_trace; -+extern const char * const mi_lttng_loglevel_str_log4j_all; - - /* String related to loglevel type */ --const char * const mi_lttng_loglevel_type_all; --const char * const mi_lttng_loglevel_type_range; --const char * const mi_lttng_loglevel_type_single; --const char * const mi_lttng_loglevel_type_unknown; -+extern const char * const mi_lttng_loglevel_type_all; -+extern const char * const mi_lttng_loglevel_type_range; -+extern const char * const mi_lttng_loglevel_type_single; -+extern const char * const mi_lttng_loglevel_type_unknown; - - /* Sting related to lttng_calibrate */ --const char * const mi_lttng_element_calibrate; --const char * const mi_lttng_element_calibrate_function; -+extern const char * const mi_lttng_element_calibrate; -+extern const char * const mi_lttng_element_calibrate_function; - - /* String related to a lttng_snapshot */ --const char * const mi_lttng_element_snapshot_ctrl_url; --const char * const mi_lttng_element_snapshot_data_url; --const char * const mi_lttng_element_snapshot_max_size; --const char * const mi_lttng_element_snapshot_n_ptr; --const char * const mi_lttng_element_snapshot_session_name; --const char * const mi_lttng_element_snapshots; -+extern const char * const mi_lttng_element_snapshot_ctrl_url; -+extern const char * const mi_lttng_element_snapshot_data_url; -+extern const char * const mi_lttng_element_snapshot_max_size; -+extern const char * const mi_lttng_element_snapshot_n_ptr; -+extern const char * const mi_lttng_element_snapshot_session_name; -+extern const char * const mi_lttng_element_snapshots; - - /* Utility string function */ - const char *mi_lttng_loglevel_string(int value, enum lttng_domain_type domain); --- -2.6.3 -Signature · 6 lines
2.6.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'