[GIT] kbuild fixes for 3.0

Commit Message

Arnaud Lacombe June 10, 2011, 3:14 a.m. UTC

Hi,

On Thu, Jun 9, 2011 at 8:10 PM, Linus Torvalds
<[e-mail]> wrote:
> On Thu, Jun 9, 2011 at 2:42 PM, Michal Marek <[e-mail]> wrote:
>>
>>      kbuild: Hack for depmod not handling X.Y versions
>
> This doesn't seem to be enough, I still get (on F-14):
>
>  sh /home/torvalds/v2.6/linux/arch/x86/boot/install.sh
> 3.0-rc2-00251-g7f45e5cd1718-dirty arch/x86/boot/bzImage \
>        System.map "/boot"
>  WARNING: Couldn't open directory
> /tmp/initramfs.Z9p0zm/lib/modules/3.0.0-rc2-00191-g4c1f683a4a34-dirty:
> No such file or directory
>  FATAL: Could not open
> /tmp/initramfs.Z9p0zm/lib/modules/3.0.0-rc2-00191-g4c1f683a4a34-dirty/modules.dep.temp
> for writing: No such file or directory
>  E: "depmod -a 3.0-rc2-00251-g7f45e5cd1718-dirty" failed.
>
> from "make install" when I try to remove the SUBLEVEL.
>
> As a result, the initrd is unusable, and has no modules in it.
>
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:

install is fine for me. What bugs me is that "git grep '\.temp'" in
that tree does not return anything relevant.

Thanks,
 - Arnaud
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Linus Torvalds June 10, 2011, 3:37 a.m. UTC | #1

On Thu, Jun 9, 2011 at 8:14 PM, Arnaud Lacombe <[e-mail]> 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.

If it works for you, I suspect you're running a different distribution.

                  Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Arnaud Lacombe June 10, 2011, 3:41 a.m. UTC | #2

Hi,

On Thu, Jun 9, 2011 at 11:37 PM, Linus Torvalds
<[e-mail]> wrote:
> On Thu, Jun 9, 2011 at 8:14 PM, Arnaud Lacombe <[e-mail]> 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.
>
> If it works for you, I suspect you're running a different distribution.
>
Actually, I was just installing as a user with INSTALL_PATH set, so it
did not get until the `new-kernel-pkg' step.

 - Arnaud


>                  Linus
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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