Commit 028568d8 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: revert $(realpath ...) to $(shell cd ... && /bin/pwd) 



I thought commit 8e9b4667 ("kbuild: use $(abspath ...) instead of
$(shell cd ... && /bin/pwd)") was a safe conversion, but it changed
the behavior.

$(abspath ...) / $(realpath ...) does not expand shell special
characters, such as '~'.

Here is a simple Makefile example:

  ---------------->8----------------
  $(info /bin/pwd: $(shell cd ~/; /bin/pwd))
  $(info abspath: $(abspath ~/))
  $(info realpath: $(realpath ~/))
  all:
          @:
  ---------------->8----------------

  $ make
  /bin/pwd: /home/masahiro
  abspath: /home/masahiro/workspace/~
  realpath:

This can be a real problem if 'make O=~/foo' is invoked from another
Makefile or primitive shell like dash.

This commit partially reverts 8e9b4667.

Fixes: 8e9b4667 ("kbuild: use $(abspath ...) instead of $(shell cd ... && /bin/pwd)")
Reported-by: default avatarJulien Grall <julien.grall@arm.com>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: default avatarJulien Grall <julien.grall@arm.com>
parent 9e66317d

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ endif 
ifneq ($(KBUILD_OUTPUT),)

# check that the output directory actually exists

saved-output := $(KBUILD_OUTPUT)

$(shell [ -d $(KBUILD_OUTPUT) ] || mkdir -p $(KBUILD_OUTPUT))

KBUILD_OUTPUT := $(realpath $(KBUILD_OUTPUT))

KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \

								&& /bin/pwd)

$(if $(KBUILD_OUTPUT),, \

     $(error failed to create output directory "$(saved-output)"))

tools/power/cpupower/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ endif 


ifneq ($(OUTPUT),)

# check that the output directory actually exists

OUTDIR := $(realpath $(OUTPUT))

OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)

$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

endif

tools/scripts/Makefile.include

+3 −3
Original line number Diff line number Diff line 
ifneq ($(O),)

ifeq ($(origin O), command line)

	ABSOLUTE_O := $(realpath $(O))

	dummy := $(if $(ABSOLUTE_O),,$(error O=$(O) does not exist))

	dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),)

	ABSOLUTE_O := $(shell cd $(O) ; pwd)

	OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/)

	COMMAND_O := O=$(ABSOLUTE_O)

ifeq ($(objtree),)
@@ -12,7 +12,7 @@ endif 


# check that the output directory actually exists

ifneq ($(OUTPUT),)

OUTDIR := $(realpath $(OUTPUT))

OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)

$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE