linux-kernel - Re: [BUGFIX PATCH] 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]

Message-ID: <69916e54-f555-191b-a9b1-8e7bc1043002@infradead.org>
Date:   Fri, 6 Mar 2020 08:26:43 -0800
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Masami Hiramatsu <mhiramat@...nel.org>,
        Geert Uytterhoeven <geert@...ux-m68k.org>
Cc:     Steven Rostedt <rostedt@...dmis.org>,
        Borislav Petkov <bp@...en8.de>,
        LKML <linux-kernel@...r.kernel.org>,
        Ingo Molnar <mingo@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Peter Zijlstra <peterz@...radead.org>,
        Sasha Levin <sashal@...nel.org>
Subject: Re: [BUGFIX PATCH] tools: Let O= makes handle a relative path with -C
 option

On 3/6/20 7:07 AM, Masami Hiramatsu wrote:
> Thanks Geert,
> 
> So Randy, what you will get if you add "echo $(PWD)" instead of "cd $(PWD)" ?
> Is that still empty or shows the tools/bootconfig directory?
> 
> Thanks,

OK, in these lines:
+       dummy := $(if $(shell cd $(PWD); test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)
+       ABSOLUTE_O := $(shell cd $(PWD); cd $(O) ; pwd)

I changed both "cd $(PWD)" to "echo $(PWD)" and did
$ make O=BUILD -C tools/bootconfig/

and this is the build log:

make: Entering directory '/home/rdunlap/lnx/next/linux-next-20200306/tools/bootconfig'
cc ../../lib/bootconfig.c main.c -Wall -g -I./include -o bootconfig
make: Leaving directory '/home/rdunlap/lnx/next/linux-next-20200306/tools/bootconfig'


Does that help?

Thanks.

> On Fri, 6 Mar 2020 08:52:40 +0100
> Geert Uytterhoeven <geert@...ux-m68k.org> wrote:
> 
>> CC +kbuild, -stable
>>
>> On Thu, Mar 5, 2020 at 7:03 AM Masami Hiramatsu <mhiramat@...nel.org> wrote:
>>> When I compiled tools/bootconfig from top directory with
>>> -C option, the O= option didn't work correctly if I passed
>>> a relative path.
>>>
>>>   $ make O=./builddir/ -C tools/bootconfig/
>>>   make: Entering directory '/home/mhiramat/ksrc/linux/tools/bootconfig'
>>>   ../scripts/Makefile.include:4: *** O=./builddir/ does not exist.  Stop.
>>>   make: Leaving directory '/home/mhiramat/ksrc/linux/tools/bootconfig'
>>>
>>> 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.
>>>
>>> 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>
>>> ---
>>>  tools/scripts/Makefile.include |    4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> 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),)
>>>
> 
> 


-- 
~Randy
Reported-by: Randy Dunlap <rdunlap@...radead.org>