Re: [ 074/147] kbuild: Do not package /boot and /lib in make tar-pkg

Herton Ronaldo Krzesinski
2012-10-17T16:22:20Z

On Sun, Oct 14, 2012 at 03:36:47PM +0100, Ben Hutchings wrote:
> 3.2-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Michal Marek <mmarek@suse.cz>
>
> commit fe04ddf7c2910362f3817c8156e41cbd6c0ee35d upstream.
>
> There were reports of users destroying their Fedora installs by a kernel
> tarball that replaces the /lib -> /usr/lib symlink. Let's remove the
> toplevel directories from the tarball to prevent this from happening.
>
> Reported-by: Andi Kleen <andi@firstfloor.org>
> Suggested-by: Ben Hutchings <ben@decadent.org.uk>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
> [bwh: Backported to 3.2: drop redundant changes]
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---
> scripts/Makefile.fwinst | 4 ++--
> scripts/package/buildtar | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
> index 4d908d1..c3f69ae 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)

Pulling Linus tree today, I noticed commit
3ce9e53e788881da0d5f3912f80e0dd6b501f304 ("kbuild: Fix accidental revert
in commit fe04ddf"). This change to Makefile.fwinst is unrelated and
shouldn't be applied. This hunk was suspicious, could be dropped if not
too late. Otherwise, just picking 3ce9e53e7 later would be fine as well.

--
[]'s
Herton