| From foo@baz Wed Aug 22 09:42:09 CEST 2018 |
| From: Kim Phillips <kim.phillips@arm.com> |
| Date: Fri, 29 Jun 2018 12:46:52 -0500 |
| Subject: perf llvm-utils: Remove bashism from kernel include fetch script |
| |
| From: Kim Phillips <kim.phillips@arm.com> |
| |
| [ Upstream commit f6432b9f65001651412dbc3589d251534822d4ab ] |
| |
| Like system(), popen() calls /bin/sh, which may/may not be bash. |
| |
| Script when run on dash and encounters the line, yields: |
| |
| exit: Illegal number: -1 |
| |
| checkbashisms report on script content: |
| |
| possible bashism (exit|return with negative status code): |
| exit -1 |
| |
| Remove the bashism and use the more portable non-zero failure |
| status code 1. |
| |
| Signed-off-by: Kim Phillips <kim.phillips@arm.com> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> |
| Cc: Jiri Olsa <jolsa@redhat.com> |
| Cc: Michael Petlan <mpetlan@redhat.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Sandipan Das <sandipan@linux.vnet.ibm.com> |
| Cc: Thomas Richter <tmricht@linux.vnet.ibm.com> |
| Link: http://lkml.kernel.org/r/20180629124652.8d0af7e2281fd3fd8262cacc@arm.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/perf/util/llvm-utils.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/tools/perf/util/llvm-utils.c |
| +++ b/tools/perf/util/llvm-utils.c |
| @@ -260,16 +260,16 @@ static const char *kinc_fetch_script = |
| "#!/usr/bin/env sh\n" |
| "if ! test -d \"$KBUILD_DIR\"\n" |
| "then\n" |
| -" exit -1\n" |
| +" exit 1\n" |
| "fi\n" |
| "if ! test -f \"$KBUILD_DIR/include/generated/autoconf.h\"\n" |
| "then\n" |
| -" exit -1\n" |
| +" exit 1\n" |
| "fi\n" |
| "TMPDIR=`mktemp -d`\n" |
| "if test -z \"$TMPDIR\"\n" |
| "then\n" |
| -" exit -1\n" |
| +" exit 1\n" |
| "fi\n" |
| "cat << EOF > $TMPDIR/Makefile\n" |
| "obj-y := dummy.o\n" |