linux-kernel - Re: [BUGFIX PATCH v2] tools: Let O= makes handle a relative path with -C option

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Fri, 6 Mar 2020 17:12:03 -0300
From:   Arnaldo Carvalho de Melo <arnaldo.melo@...il.com>
To:     Masami Hiramatsu <mhiramat@...nel.org>
Cc:     Steven Rostedt <rostedt@...dmis.org>,
        Geert Uytterhoeven <geert@...ux-m68k.org>,
        Borislav Petkov <bp@...en8.de>,
        LKML <linux-kernel@...r.kernel.org>,
        Ingo Molnar <mingo@...nel.org>,
        Randy Dunlap <rdunlap@...radead.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Peter Zijlstra <peterz@...radead.org>,
        Sasha Levin <sashal@...nel.org>, Jiri Olsa <jolsa@...hat.com>,
        Masahiro Yamada <masahiroy@...nel.org>,
        Michal Marek <michal.lkml@...kovi.net>
Subject: Re: [BUGFIX PATCH v2] tools: Let O= makes handle a relative path
 with -C option

Em Sat, Mar 07, 2020 at 03:32:58AM +0900, Masami Hiramatsu escreveu:
> When I compiled tools/perf from top directory with the -C option,
> the O= option didn't work correctly if I passed a relative path.
> 
>   $ make O=BUILD -C tools/perf/
>   make: Entering directory '/home/mhiramat/ksrc/linux/tools/perf'
>     BUILD:   Doing 'make -j8' parallel build
>   ../scripts/Makefile.include:4: *** O=/home/mhiramat/ksrc/linux/tools/perf/BUILD does not exist.  Stop.
>   make: *** [Makefile:70: all] Error 2
>   make: Leaving directory '/home/mhiramat/ksrc/linux/tools/perf'
> 
> The O= directory existence check failed because the check
> script ran in the build target directory instead of the
> directory where I ran the make command.
> 
> To fix that, once change directory to $(PWD) and check O=
> directory, since the PWD is set to where the make command
> runs.

Tested with O=/non/relative/paths, as I always use, not to polute the
checked out kerneo sources, and with a relative path, as fixed in this
patch, now both works, thanks, will be in my next perf/urgent pull req
to Ingo.

- Arnaldo
 
> Fixes: c883122acc0d ("perf tools: Let O= makes handle relative paths")
> Reported-by: Randy Dunlap <rdunlap@...radead.org>
> Signed-off-by: Masami Hiramatsu <mhiramat@...nel.org>
> Cc: stable@...r.kernel.org
> 
> ---
>  Changes in V2:
>  - Fix tools/perf/Makefile because it has own O= pre-process.
>  - Use tools/perf for example.
>  - Add explicit Cc: stable@...r.kernel.org tag.
> ---
>  tools/perf/Makefile            |    2 +-
>  tools/scripts/Makefile.include |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/Makefile b/tools/perf/Makefile
> index 7902a5681fc8..b8fc7d972be9 100644
> --- a/tools/perf/Makefile
> +++ b/tools/perf/Makefile
> @@ -35,7 +35,7 @@ endif
>  # Only pass canonical directory names as the output directory:
>  #
>  ifneq ($(O),)
> -  FULL_O := $(shell readlink -f $(O) || echo $(O))
> +  FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O))
>  endif
>  
>  #
> diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include
> index ded7a950dc40..6d2f3a1b2249 100644
> --- a/tools/scripts/Makefile.include
> +++ b/tools/scripts/Makefile.include
> @@ -1,8 +1,8 @@
>  # SPDX-License-Identifier: GPL-2.0
>  ifneq ($(O),)
>  ifeq ($(origin O), command line)
> -	dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
> -	ABSOLUTE_O := $(shell cd $(O) ; pwd)
> +	dummy := $(if $(shell cd $(PWD); test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
> +	ABSOLUTE_O := $(shell cd $(PWD); cd $(O) ; pwd)
>  	OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/)
>  	COMMAND_O := O=$(ABSOLUTE_O)
>  ifeq ($(objtree),)
> 

-- 

- Arnaldo