Skip to contentSkip to conversation

FAILED: patch "[PATCH] tools: Let O= makes handle a relative path with -C option" failed to apply to 4.9-stable tree

PATCH [email protected] 2 participants 2 messages Mar 30, 2020

Subsystems (2)
Stable branch perf events
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From be40920fbf1003c38ccdc02b571e01a75d890c82 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
Date: Sat, 7 Mar 2020 03:32:58 +0900
Subject: [PATCH] tools: Let O= makes handle a relative path with -C option

When I tried to compile tools/perf from the 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.

Fixes c883122acc0d ("perf tools: Let O= makes handle relative paths")
Reported-by Randy Dunlap <[email protected]>
Signed-off-by Masami Hiramatsu <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Michal Marek <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Sasha Levin <[email protected]>
Cc Steven Rostedt (VMware) <[email protected]>
Cc [email protected]
Link http://lore.kernel.org/lkml/158351957799.3363.15269768530697526765.stgit@devnote2 open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
tools/perf/Makefile +1 -1
index 7902a5681fc8..b8fc7d972be9 100644
@@ -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
 
 #
tools/scripts/Makefile.include +2 -2
index ded7a950dc40..6d2f3a1b2249 100644
@@ -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),)
maintainer
#1 lore raw
Quoted 34 lines · On Mon, Mar 30, 2020 at 02:11:36PM +0200, [email protected] wrote:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From be40920fbf1003c38ccdc02b571e01a75d890c82 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <[email protected]>
Date: Sat, 7 Mar 2020 03:32:58 +0900
Subject: [PATCH] tools: Let O= makes handle a relative path with -C option

When I tried to compile tools/perf from the 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.

Quoted 15 lines
Fixes c883122acc0d ("perf tools: Let O= makes handle relative paths")
Reported-by Randy Dunlap <[email protected]>
Signed-off-by Masami Hiramatsu <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Masahiro Yamada <[email protected]>
Cc Michal Marek <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Sasha Levin <[email protected]>
Cc Steven Rostedt (VMware) <[email protected]>
Cc [email protected]
Link http://lore.kernel.org/lkml/158351957799.3363.15269768530697526765.stgit@devnote2 open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

Context conflicts with license changes... Fixed and queued up.

Signature · 2 lines
Thanks,
Sasha