diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-11-05 04:44:16 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-17 21:32:27 -0500 |
commit | 16f8259ca77d04f95e5ca90be1b1894ed45816c0 (patch) | |
tree | d217baf9c216dd18a815ad066434efd646c70c11 | |
parent | 2ce079f04d5914dae14fdc8618f804cc0d2a1b8f (diff) |
kbuild: /bin/pwd -> pwd
Most places use pwd and rely on $PATH lookup. Moving the remaining
absolute path /bin/pwd users over for consistency.
Also, a reason for doing /bin/pwd -> pwd instead of the other way around
is because I believe build systems should make little assumptions on
host filesystem layout. Case in point, we do this kind of patching
already in NixOS.
Ref. commit 028568d84da3cfca49f5f846eeeef01441d70451
("kbuild: revert $(realpath ...) to $(shell cd ... && /bin/pwd)").
Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r-- | Documentation/ia64/xen.txt | 2 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | tools/power/cpupower/Makefile | 2 | ||||
-rw-r--r-- | tools/scripts/Makefile.include | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/ia64/xen.txt b/Documentation/ia64/xen.txt index c61a99f7c8bb..a12c74ce2773 100644 --- a/Documentation/ia64/xen.txt +++ b/Documentation/ia64/xen.txt | |||
@@ -41,7 +41,7 @@ Getting and Building Xen and Dom0 | |||
41 | 41 | ||
42 | 5. make initrd for Dom0/DomU | 42 | 5. make initrd for Dom0/DomU |
43 | # make -C linux-2.6.18-xen.hg ARCH=ia64 modules_install \ | 43 | # make -C linux-2.6.18-xen.hg ARCH=ia64 modules_install \ |
44 | O=$(/bin/pwd)/build-linux-2.6.18-xen_ia64 | 44 | O=$(pwd)/build-linux-2.6.18-xen_ia64 |
45 | # mkinitrd -f /boot/efi/efi/redhat/initrd-2.6.18.8-xen.img \ | 45 | # mkinitrd -f /boot/efi/efi/redhat/initrd-2.6.18.8-xen.img \ |
46 | 2.6.18.8-xen --builtin mptspi --builtin mptbase \ | 46 | 2.6.18.8-xen --builtin mptspi --builtin mptbase \ |
47 | --builtin mptscsih --builtin uhci-hcd --builtin ohci-hcd \ | 47 | --builtin mptscsih --builtin uhci-hcd --builtin ohci-hcd \ |
@@ -132,7 +132,7 @@ ifneq ($(KBUILD_OUTPUT),) | |||
132 | # check that the output directory actually exists | 132 | # check that the output directory actually exists |
133 | saved-output := $(KBUILD_OUTPUT) | 133 | saved-output := $(KBUILD_OUTPUT) |
134 | KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \ | 134 | KBUILD_OUTPUT := $(shell mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) \ |
135 | && /bin/pwd) | 135 | && pwd) |
136 | $(if $(KBUILD_OUTPUT),, \ | 136 | $(if $(KBUILD_OUTPUT),, \ |
137 | $(error failed to create output directory "$(saved-output)")) | 137 | $(error failed to create output directory "$(saved-output)")) |
138 | 138 | ||
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index da205d1fa03c..1dd5f4fcffd5 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile | |||
@@ -26,7 +26,7 @@ endif | |||
26 | 26 | ||
27 | ifneq ($(OUTPUT),) | 27 | ifneq ($(OUTPUT),) |
28 | # check that the output directory actually exists | 28 | # check that the output directory actually exists |
29 | OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd) | 29 | OUTDIR := $(shell cd $(OUTPUT) && pwd) |
30 | $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist)) | 30 | $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist)) |
31 | endif | 31 | endif |
32 | 32 | ||
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 654efd9768fd..3fab179b1aba 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include | |||
@@ -13,7 +13,7 @@ endif | |||
13 | 13 | ||
14 | # check that the output directory actually exists | 14 | # check that the output directory actually exists |
15 | ifneq ($(OUTPUT),) | 15 | ifneq ($(OUTPUT),) |
16 | OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd) | 16 | OUTDIR := $(shell cd $(OUTPUT) && pwd) |
17 | $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist)) | 17 | $(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist)) |
18 | endif | 18 | endif |
19 | 19 | ||