CHROMIUM: make-3.82: hack to fix differing behaviour between 3.81 and 3.82
Brian Harring [Sat, 24 Dec 2011 02:16:15 +0000 (18:16 -0800)]
BUG=chromium-os:19882
TEST=emerge make-3.82 via I7d0a6e25, emerge-x86-alex chromeos-kernel

Change-Id: I6accabc10e93fe12debba42667900e4e0463cb41
Signed-off-by: Brian Harring <ferringb@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/13474
Reviewed-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: http://git-master/r/189630
Tested-by: Andrew Chew <achew@nvidia.com>
Reviewed-by: Allen Martin <amartin@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-on: http://git-master/r/196082

scripts/Makefile.fwinst

index 6bf8e87..689204f 100644 (file)
@@ -27,7 +27,7 @@ endif
 installed-mod-fw := $(addprefix $(INSTALL_FW_PATH)/,$(mod-fw))
 
 installed-fw := $(addprefix $(INSTALL_FW_PATH)/,$(fw-shipped-all))
-installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)/.
+installed-fw-dirs := $(sort $(dir $(installed-fw))) $(INSTALL_FW_PATH)
 
 # Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.
 PHONY += $(INSTALL_FW_PATH)/$$(%) install-all-dirs
@@ -36,6 +36,14 @@ $(INSTALL_FW_PATH)/$$(%): install-all-dirs
 install-all-dirs: $(installed-fw-dirs)
        @true
 
+
+# hack for make-3.82 support; without this (admittedly daft) rule,
+# firmware installation fails since it can't find a matching
+# rule for $(INSTALL_FW_PATH/..
+# leave the hack in place till the root cause is fully found, without
+# it make-3.82 cannot be used.
+$(INSTALL_FW_PATH)/./: $(INSTALL_FW_PATH)
+
 quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
       cmd_install = $(INSTALL) -m0644 $< $@