* [PATCH] perf build: Make minimal shellcheck version to v0.6.0
@ 2024-01-22 8:04 Yicong Yang
2024-01-23 16:04 ` Ian Rogers
2024-01-24 1:01 ` Namhyung Kim
0 siblings, 2 replies; 4+ messages in thread
From: Yicong Yang @ 2024-01-22 8:04 UTC (permalink / raw)
To: acme, namhyung, peterz, irogers, mark.rutland, alexander.shishkin,
jolsa, linux-perf-users
Cc: yangyicong, hejunhao3, linuxarm
From: Yicong Yang <yangyicong@hisilicon.com>
perf build failed due to the shellcheck on my machine (v0.4.6 on Ubuntu
18.04.1 LTS) doesn't support -a/--check-sourced and -S/--severity option.
These two options are introduced in shellcheck v0.4.7 and v0.6.0
respectively. So restrict the minimal version of shellcheck to v0.6.0.
Fixes: b809fc656e76 ("perf build: Shellcheck support for OUTPUT directory")
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
tools/perf/Makefile.perf | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 27e7c478880f..f8774a9b1377 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -236,6 +236,16 @@ else
SHELLCHECK := $(shell which shellcheck 2> /dev/null)
endif
+# shellcheck is using in tools/perf/tests/Build with option -a/--check-sourced (
+# introduced in v0.4.7) and -S/--severity (introduced in v0.6.0). So make the
+# minimal shellcheck version as v0.6.0.
+ifneq ($(SHELLCHECK),)
+ ifeq ($(shell expr $(shell $(SHELLCHECK) --version | grep version: | \
+ sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 060), 1)
+ SHELLCHECK :=
+ endif
+endif
+
export srctree OUTPUT RM CC CXX LD AR CFLAGS CXXFLAGS V BISON FLEX AWK
export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK
--
2.24.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] perf build: Make minimal shellcheck version to v0.6.0
2024-01-22 8:04 [PATCH] perf build: Make minimal shellcheck version to v0.6.0 Yicong Yang
@ 2024-01-23 16:04 ` Ian Rogers
2024-01-26 14:26 ` Arnaldo Carvalho de Melo
2024-01-24 1:01 ` Namhyung Kim
1 sibling, 1 reply; 4+ messages in thread
From: Ian Rogers @ 2024-01-23 16:04 UTC (permalink / raw)
To: Yicong Yang
Cc: acme, namhyung, peterz, mark.rutland, alexander.shishkin, jolsa,
linux-perf-users, yangyicong, hejunhao3, linuxarm
On Mon, Jan 22, 2024 at 12:08 AM Yicong Yang <yangyicong@huawei.com> wrote:
>
> From: Yicong Yang <yangyicong@hisilicon.com>
>
> perf build failed due to the shellcheck on my machine (v0.4.6 on Ubuntu
> 18.04.1 LTS) doesn't support -a/--check-sourced and -S/--severity option.
> These two options are introduced in shellcheck v0.4.7 and v0.6.0
> respectively. So restrict the minimal version of shellcheck to v0.6.0.
>
> Fixes: b809fc656e76 ("perf build: Shellcheck support for OUTPUT directory")
> Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Reviewed-by: Ian Rogers <irogers@google.com>
Thanks,
Ian
> ---
> tools/perf/Makefile.perf | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 27e7c478880f..f8774a9b1377 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -236,6 +236,16 @@ else
> SHELLCHECK := $(shell which shellcheck 2> /dev/null)
> endif
>
> +# shellcheck is using in tools/perf/tests/Build with option -a/--check-sourced (
> +# introduced in v0.4.7) and -S/--severity (introduced in v0.6.0). So make the
> +# minimal shellcheck version as v0.6.0.
> +ifneq ($(SHELLCHECK),)
> + ifeq ($(shell expr $(shell $(SHELLCHECK) --version | grep version: | \
> + sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 060), 1)
> + SHELLCHECK :=
> + endif
> +endif
> +
> export srctree OUTPUT RM CC CXX LD AR CFLAGS CXXFLAGS V BISON FLEX AWK
> export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK
>
> --
> 2.24.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] perf build: Make minimal shellcheck version to v0.6.0
2024-01-22 8:04 [PATCH] perf build: Make minimal shellcheck version to v0.6.0 Yicong Yang
2024-01-23 16:04 ` Ian Rogers
@ 2024-01-24 1:01 ` Namhyung Kim
1 sibling, 0 replies; 4+ messages in thread
From: Namhyung Kim @ 2024-01-24 1:01 UTC (permalink / raw)
To: Yicong Yang
Cc: acme, peterz, irogers, mark.rutland, alexander.shishkin, jolsa,
linux-perf-users, yangyicong, hejunhao3, linuxarm, Athira Rajeev
Adding Athira to CC.
Thanks,
Namhyung
On Mon, Jan 22, 2024 at 12:08 AM Yicong Yang <yangyicong@huawei.com> wrote:
>
> From: Yicong Yang <yangyicong@hisilicon.com>
>
> perf build failed due to the shellcheck on my machine (v0.4.6 on Ubuntu
> 18.04.1 LTS) doesn't support -a/--check-sourced and -S/--severity option.
> These two options are introduced in shellcheck v0.4.7 and v0.6.0
> respectively. So restrict the minimal version of shellcheck to v0.6.0.
>
> Fixes: b809fc656e76 ("perf build: Shellcheck support for OUTPUT directory")
> Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
> ---
> tools/perf/Makefile.perf | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 27e7c478880f..f8774a9b1377 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -236,6 +236,16 @@ else
> SHELLCHECK := $(shell which shellcheck 2> /dev/null)
> endif
>
> +# shellcheck is using in tools/perf/tests/Build with option -a/--check-sourced (
> +# introduced in v0.4.7) and -S/--severity (introduced in v0.6.0). So make the
> +# minimal shellcheck version as v0.6.0.
> +ifneq ($(SHELLCHECK),)
> + ifeq ($(shell expr $(shell $(SHELLCHECK) --version | grep version: | \
> + sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \< 060), 1)
> + SHELLCHECK :=
> + endif
> +endif
> +
> export srctree OUTPUT RM CC CXX LD AR CFLAGS CXXFLAGS V BISON FLEX AWK
> export HOSTCC HOSTLD HOSTAR HOSTCFLAGS SHELLCHECK
>
> --
> 2.24.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] perf build: Make minimal shellcheck version to v0.6.0
2024-01-23 16:04 ` Ian Rogers
@ 2024-01-26 14:26 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 4+ messages in thread
From: Arnaldo Carvalho de Melo @ 2024-01-26 14:26 UTC (permalink / raw)
To: Ian Rogers
Cc: Yicong Yang, namhyung, peterz, mark.rutland, alexander.shishkin,
jolsa, linux-perf-users, yangyicong, hejunhao3, linuxarm
Em Tue, Jan 23, 2024 at 08:04:55AM -0800, Ian Rogers escreveu:
> On Mon, Jan 22, 2024 at 12:08 AM Yicong Yang <yangyicong@huawei.com> wrote:
> >
> > From: Yicong Yang <yangyicong@hisilicon.com>
> >
> > perf build failed due to the shellcheck on my machine (v0.4.6 on Ubuntu
> > 18.04.1 LTS) doesn't support -a/--check-sourced and -S/--severity option.
> > These two options are introduced in shellcheck v0.4.7 and v0.6.0
> > respectively. So restrict the minimal version of shellcheck to v0.6.0.
> >
> > Fixes: b809fc656e76 ("perf build: Shellcheck support for OUTPUT directory")
> > Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
>
> Reviewed-by: Ian Rogers <irogers@google.com>
Thanks, applied to perf-tools.
- Arnaldo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-26 14:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-22 8:04 [PATCH] perf build: Make minimal shellcheck version to v0.6.0 Yicong Yang
2024-01-23 16:04 ` Ian Rogers
2024-01-26 14:26 ` Arnaldo Carvalho de Melo
2024-01-24 1:01 ` Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).