Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ce9e53e authored Oct 15, 2012 by Michal Marek Committed by Linus Torvalds Oct 15, 2012

kbuild: Fix accidental revert in commit fe04ddf7



Commit fe04ddf7 ("kbuild: Do not package /boot and /lib in make
tar-pkg") accidentally reverted two previous kbuild commits.  I don't
know what I was thinking.

This brings back changes made by commits 24cc7fb6 ("x86/kbuild:
archscripts depends on scripts_basic") and c1c1a59e ("firmware: fix
directory creation rule matching with make 3.80")

Reported-by: Jan Beulich <JBeulich@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 29bb4cc5

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