Skip to content

Commit

Permalink
kbuild: Do not use hyphen in exported variable name
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
  • Loading branch information
bwhacks authored and masahir0y committed Aug 21, 2017
1 parent 801d2e9 commit 2bfbe78
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/Makefile.dtbinst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ src := $(obj)
PHONY := __dtbs_install
__dtbs_install:

export dtbinst-root ?= $(obj)
export dtbinst_root ?= $(obj)

include include/config/auto.conf
include scripts/Kbuild.include
Expand All @@ -27,7 +27,7 @@ dtbinst-dirs := $(dts-dirs)
quiet_cmd_dtb_install = INSTALL $<
cmd_dtb_install = mkdir -p $(2); cp $< $(2)

install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj))

$(dtbinst-files): %.dtb: $(obj)/%.dtb
$(call cmd,dtb_install,$(install-dir))
Expand Down

0 comments on commit 2bfbe78

Please sign in to comment.