linux-kernel - Re: [PATCH 1/2] bootconfig: Support O=<builddir> 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:   Thu, 5 Mar 2020 11:05:27 +0900
From:   Masami Hiramatsu <mhiramat@...nel.org>
To:     Randy Dunlap <rdunlap@...radead.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>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Peter Zijlstra <peterz@...radead.org>
Subject: Re: [PATCH 1/2] bootconfig: Support O=<builddir> option

On Wed, 4 Mar 2020 15:04:43 -0800
Randy Dunlap <rdunlap@...radead.org> wrote:

> On 3/3/20 3:24 AM, Masami Hiramatsu wrote:
> > Support O=<builddir> option to build bootconfig tool in
> > the other directory. As same as other tools, if you specify
> > O=<builddir>, bootconfig command is build under <builddir>.
> 
> Hm.  If I use
> $ make O=~/tmp -C tools/bootconfig
> 
> that works: it builds bootconfig in ~/tmp.
> 
> OTOH, if I sit at the top of the kernel source tree
> and I enter
> $ mkdir builddir
> $ make O=builddir -C tools/bootconfig
> 
> I get this:
> make: Entering directory '/home/rdunlap/lnx/next/linux-next-20200304/tools/bootconfig'
> ../scripts/Makefile.include:4: *** O=builddir does not exist.  Stop.
> make: Leaving directory '/home/rdunlap/lnx/next/linux-next-20200304/tools/bootconfig'
> 
> so it looks like tools/scripts/Makefile.include doesn't handle this case correctly
> (which is how I do all of my builds).

Yes, I think that should be fixed in another patch. What about below?

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),)


Thank you,

-- 
Masami Hiramatsu <mhiramat@...nel.org>