lkml.org 
[lkml]   [2012]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 074/147] kbuild: Do not package /boot and /lib in make tar-pkg
    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)

    PHONY += __fw_install __fw_modinst FORCE
    diff --git a/scripts/package/buildtar b/scripts/package/buildtar
    index 8a7b155..d0d748e 100644
    --- a/scripts/package/buildtar
    +++ b/scripts/package/buildtar
    @@ -109,7 +109,7 @@ esac
    if tar --owner=root --group=root --help >/dev/null 2>&1; then
    opts="--owner=root --group=root"
    fi
    - tar cf - . $opts | ${compress} > "${tarball}${file_ext}"
    + tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
    )

    echo "Tarball successfully created in ${tarball}${file_ext}"



    \
     
     \ /
      Last update: 2012-10-14 18:01    [W:3.163 / U:1.836 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site