lkml.org 
[lkml]   [2011]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: [GIT] kbuild fixes for 3.0
    From
    Hi,

    On Thu, Jun 9, 2011 at 11:37 PM, Linus Torvalds
    <torvalds@linux-foundation.org> wrote:
    > On Thu, Jun 9, 2011 at 8:14 PM, Arnaud Lacombe <lacombar@gmail.com> wrote:
    >>
    >> any chance to share your .config ? x86-64's defconfig, plus Michal
    >> branch merged on top of the tip of your tree, plus the following patch
    >> removing the SUBLEVEL:
    >>
    >> diff --git a/Makefile b/Makefile
    >> index 72c0e32..5c75864 100644
    >> --- a/Makefile
    >> +++ b/Makefile
    >> @@ -1,6 +1,6 @@
    >>  VERSION = 3
    >>  PATCHLEVEL = 0
    >> -SUBLEVEL = 0
    >> +SUBLEVEL =
    >>  EXTRAVERSION = -rc2
    >>  NAME = Sneaky Weasel
    >>
    >> install is fine for me. What bugs me is that "git grep '\.temp'" in
    >> that tree does not return anything relevant.
    >
    > "make install" just runs the distro install script, usually
    > /sbin/installkernel, which at least on F-14 will then run
    > /sbin/new-kernel-pkg /sbin/dracut to build the initrd etc.
    >
    > And that runs "depmod", which seems to end up being confused: we give
    > it the new kernel version as an argument, but it seems to not like it,
    > so it decides to do "uname()" to get the _current_ kernel version
    > instead, and that is where the confusion comes from.
    >
    For the record, this should have been fixed by Michal in:

    commit 3328d178247017affd90b7897393699f2f45227d
    Author: Michal Marek <mmarek@suse.cz>
    Date: Mon May 30 15:58:43 2011 +0200

    depmod: Handle X.Y kernel versions

    What a stupid check.

    Signed-off-by: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Jon Masters <jcm@jonmasters.org>

    from the module-init-tools git tree. Change is pretty trivial:

    diff --git a/depmod.c b/depmod.c
    index abfb11e..98a5efa 100644
    --- a/depmod.c
    +++ b/depmod.c
    @@ -247,7 +247,7 @@ static int is_version_number(const char *version)
    {
    unsigned int dummy;

    - return (sscanf(version, "%u.%u.%u", &dummy, &dummy, &dummy) == 3);
    + return (sscanf(version, "%u.%u", &dummy, &dummy) == 2);
    }

    - Arnaud
    > If it works for you, I suspect you're running a different distribution.
    >
    >                  Linus
    >
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-06-10 05:49    [W:0.023 / U:59.680 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site