commit fe04ddf7c2910362f3817c8156e41cbd6c0ee35d reverts unrelated changes

commit fe04ddf7c2910362f3817c8156e41cbd6c0ee35d reverts unrelated changes

[Jan Beulich]

Michal,

is there any reason why that commit reverts two other changes
(to arch/x86/Makefile and scripts/Makefile.fwinst) without any
mention of the reason for this in the description?

Also, Greg, didn't this get merged into stable a little too quickly?

Thanks, Jan

Re: commit fe04ddf7c2910362f3817c8156e41cbd6c0ee35d reverts unrelated changes

[Greg KH]

On Mon, Oct 15, 2012 at 04:26:45PM +0100, Jan Beulich wrote:
> Michal,
> 
> is there any reason why that commit reverts two other changes
> (to arch/x86/Makefile and scripts/Makefile.fwinst) without any
> mention of the reason for this in the description?
> 
> Also, Greg, didn't this get merged into stable a little too quickly?

What type of information in this patch would have kept me from merging
it quickly?  How am I supposed to know that?

greg k-h

Re: commit fe04ddf7c2910362f3817c8156e41cbd6c0ee35d reverts unrelated changes

[Michal Marek]

Dne 15.10.2012 17:26, Jan Beulich napsal(a):
> Michal,
> 
> is there any reason why that commit reverts two other changes
> (to arch/x86/Makefile and scripts/Makefile.fwinst) without any
> mention of the reason for this in the description?

Oh, I don't know how this could have happened. It seems that I did a git
commit --amend at some point :-(.

Michal

Re: commit fe04ddf7c2910362f3817c8156e41cbd6c0ee35d reverts unrelated changes

[Greg KH]

On Mon, Oct 15, 2012 at 08:55:00PM +0200, Michal Marek wrote:
> Dne 15.10.2012 17:26, Jan Beulich napsal(a):
> > Michal,
> > 
> > is there any reason why that commit reverts two other changes
> > (to arch/x86/Makefile and scripts/Makefile.fwinst) without any
> > mention of the reason for this in the description?
> 
> Oh, I don't know how this could have happened. It seems that I did a git
> commit --amend at some point :-(.

Ok, be sure to mark whatever you do to fix this for also backporting to
the stable tree so I pick it up.

thanks,

greg k-h

[PATCH] kbuild: Fix accidental revert in commit fe04ddf

[Michal Marek]

Commit fe04ddf (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 patch brings back changes made by
24cc7fb (x86/kbuild: archscripts depends on scripts_basic)
c1c1a59 (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>
---
 arch/x86/Makefile       |    2 +-
 scripts/Makefile.fwinst |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 58790bd..05afcca 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -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
 
 ###
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
index c3f69ae..4d908d1 100644
--- a/scripts/Makefile.fwinst
+++ b/scripts/Makefile.fwinst
@@ -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
-- 
1.7.10.4