lkml.org 
[lkml]   [2012]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 036/270] kbuild: Do not package /boot and /lib in make tar-pkg
    From
    Date
    On Mon, 2012-11-26 at 14:55 -0200, Herton Ronaldo Krzesinski wrote:
    > 3.5.7u1 -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>
    > [ herton: dropped unrelated changes to arch/x86/Makefile and
    > scripts/Makefile.fwinst, which don't apply anyway on 3.5, see commit
    > 3ce9e53e788881da0d5f3912f80e0dd6b501f304 upstream ]
    > Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

    This is missing from 3.4.

    Ben.

    > ---
    > scripts/package/buildtar | 2 +-
    > 1 file changed, 1 insertion(+), 1 deletion(-)
    >
    > 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}"

    --
    Ben Hutchings
    Never attribute to conspiracy what can adequately be explained by stupidity.
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-11-27 04:01    [W:2.354 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site