| From c3d0832d10e385de07185a397ac174a230c7a382 Mon Sep 17 00:00:00 2001 |
| From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> |
| Date: Mon, 5 Aug 2019 13:01:50 -0400 |
| Subject: [PATCH] tools lib traceevent: Fix "robust" test of |
| do_generate_dynamic_list_file |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 82a2f88458d70704be843961e10b5cef9a6e95d3 upstream. |
| |
| The tools/lib/traceevent/Makefile had a test added to it to detect a failure |
| of the "nm" when making the dynamic list file (whatever that is). The |
| problem is that the test sorts the values "U W w" and some versions of sort |
| will place "w" ahead of "W" (even though it has a higher ASCII value, and |
| break the test. |
| |
| Add 'tr "w" "W"' to merge the two and not worry about the ordering. |
| |
| Reported-by: Tzvetomir Stoyanov <tstoyanov@vmware.com> |
| Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: David Carrillo-Cisneros <davidcc@google.com> |
| Cc: He Kuang <hekuang@huawei.com> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Cc: Michal rarek <mmarek@suse.com> |
| Cc: Paul Turner <pjt@google.com> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Stephane Eranian <eranian@google.com> |
| Cc: Uwe Kleine-Kรถnig <u.kleine-koenig@pengutronix.de> |
| Cc: Wang Nan <wangnan0@huawei.com> |
| Cc: stable@vger.kernel.org |
| Fixes: 6467753d61399 ("tools lib traceevent: Robustify do_generate_dynamic_list_file") |
| Link: http://lkml.kernel.org/r/20190805130150.25acfeb1@gandalf.local.home |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile |
| index 86ce17a1f7fb..a39cdd0d890d 100644 |
| --- a/tools/lib/traceevent/Makefile |
| +++ b/tools/lib/traceevent/Makefile |
| @@ -266,8 +266,8 @@ endef |
| |
| define do_generate_dynamic_list_file |
| symbol_type=`$(NM) -u -D $1 | awk 'NF>1 {print $$1}' | \ |
| - xargs echo "U W w" | tr ' ' '\n' | sort -u | xargs echo`;\ |
| - if [ "$$symbol_type" = "U W w" ];then \ |
| + xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ |
| + if [ "$$symbol_type" = "U W" ];then \ |
| (echo '{'; \ |
| $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ |
| echo '};'; \ |
| -- |
| 2.7.4 |
| |
