diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2017-08-19 17:30:02 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-08-20 20:06:00 -0400 |
commit | 2bfbe7881ee03d12bbedb05f804d139c88df30a0 (patch) | |
tree | d24b23c49cb81350f410a820db155866912622e0 | |
parent | 801d2e9f1cfb24c15ec821288b6bc2e3107f6fcd (diff) |
kbuild: Do not use hyphen in exported variable name
This definition in Makefile.dtbinst:
export dtbinst-root ?= $(obj)
should define and export dtbinst-root when handling the root dts
directory, and do nothing in the subdirectories. However some shells,
including dash, will not pass through environment variables whose name
includes a hyphen. Usually GNU make does not use a shell to recurse,
but if e.g. $(srctree) contains '~' it will use a shell here.
Rename the variable to dtbinst_root.
References: https://bugs.debian.org/833561
Fixes: 323a028d39cdi ("dts, kbuild: Implement support for dtb vendor subdirs")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rw-r--r-- | scripts/Makefile.dtbinst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst index 34614a48b717..993fb85982df 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst | |||
@@ -14,7 +14,7 @@ src := $(obj) | |||
14 | PHONY := __dtbs_install | 14 | PHONY := __dtbs_install |
15 | __dtbs_install: | 15 | __dtbs_install: |
16 | 16 | ||
17 | export dtbinst-root ?= $(obj) | 17 | export dtbinst_root ?= $(obj) |
18 | 18 | ||
19 | include include/config/auto.conf | 19 | include include/config/auto.conf |
20 | include scripts/Kbuild.include | 20 | include scripts/Kbuild.include |
@@ -27,7 +27,7 @@ dtbinst-dirs := $(dts-dirs) | |||
27 | quiet_cmd_dtb_install = INSTALL $< | 27 | quiet_cmd_dtb_install = INSTALL $< |
28 | cmd_dtb_install = mkdir -p $(2); cp $< $(2) | 28 | cmd_dtb_install = mkdir -p $(2); cp $< $(2) |
29 | 29 | ||
30 | install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj)) | 30 | install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj)) |
31 | 31 | ||
32 | $(dtbinst-files): %.dtb: $(obj)/%.dtb | 32 | $(dtbinst-files): %.dtb: $(obj)/%.dtb |
33 | $(call cmd,dtb_install,$(install-dir)) | 33 | $(call cmd,dtb_install,$(install-dir)) |