diff options
| author | Mark Asselstine <mark.asselstine@windriver.com> | 2012-08-08 13:14:36 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-08-30 16:27:13 +0200 |
| commit | 6c7080a61fc7b46b3ac8573952b5a3e9d5f68bc4 (patch) | |
| tree | 2326401c91f3c1d941c1d10dd54384a8970f817d | |
| parent | 367e43c50d7f7c3b0cec17f4d855a96f47f5e17b (diff) | |
| download | linux-3.10-6c7080a61fc7b46b3ac8573952b5a3e9d5f68bc4.tar.gz linux-3.10-6c7080a61fc7b46b3ac8573952b5a3e9d5f68bc4.tar.bz2 linux-3.10-6c7080a61fc7b46b3ac8573952b5a3e9d5f68bc4.zip | |
firmware: fix directory creation rule matching with make 3.82
Attempting to run 'firmware_install' with CONFIG_USB_SERIAL_TI=y when
using make 3.82 results in an error
make[2]: *** No rule to make target `/lib/firmware/./', needed by
`/lib/firmware/ti_3410.fw'. Stop.
It turns out make 3.82 is picky when matching directory names with
trailing slashes as a result, where make 3.81 would handle this
correctly make 3.82 does not find the rule needed to create the
directory.
The './' seen in the error is added by $(dir) for firmware which
resides in the base firmware src directory, such as
ti_3410.fw.ihex. By performing $(dir) after we prepend the
$(INSTALL_FW_PATH) we can ensure we don't end up with a './' in the
middle of the path and the directory will be properly created.
This change works with make 3.81 and should work with previous
versions as well.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/Makefile.fwinst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst index 6bf8e87f1dc..c3f69ae275d 100644 --- a/scripts/Makefile.fwinst +++ b/scripts/Makefile.fwinst @@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) $(installed-fw-dirs): $(call cmd,mkdir) -$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $(INSTALL_FW_PATH)/$$(dir %) +$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% | $$(dir $(INSTALL_FW_PATH)/%) $(call cmd,install) PHONY += __fw_install __fw_modinst FORCE |