Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild (56bae802) · Commits · 戴 / test

Pull kbuild fixes from Michal Marek: "There are two more kbuild fixes for 3.6. One fixes a race between x86's archscripts target and the rule (re)building scripts/basic/fixdep. The second is a fix for the previous attempt at fixing make firmware_install with make 3.82. This new solution should work with any version of GNU make" * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: x86/kbuild: archscripts depends on scripts_basic firmware: fix directory creation rule matching with make 3.80

arch/x86/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
		KBUILD_CFLAGS += $(mflags-y)
		KBUILD_AFLAGS += $(mflags-y)

		archscripts:
		archscripts: scripts_basic
		$(Q)$(MAKE) $(build)=arch/x86/tools relocs

		###

scripts/Makefile.fwinst

+2 −2

Original line number	Diff line number	Diff line
		@@ -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
		@@ -42,7 +42,7 @@ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
		$(installed-fw-dirs):
		$(call cmd,mkdir)

		$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% \| $$(dir $(INSTALL_FW_PATH)/%)
		$(installed-fw): $(INSTALL_FW_PATH)/%: $(obj)/% \| $(INSTALL_FW_PATH)/$$(dir %)
		$(call cmd,install)

		PHONY += __fw_install __fw_modinst FORCE

Admin message