From patchwork Fri Jun 10 03:45:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 867792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5A3k1SX006842 for ; Fri, 10 Jun 2011 03:46:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751914Ab1FJDqA (ORCPT ); Thu, 9 Jun 2011 23:46:00 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:56306 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657Ab1FJDqA convert rfc822-to-8bit (ORCPT ); Thu, 9 Jun 2011 23:46:00 -0400 Received: by pwi15 with SMTP id 15so1042733pwi.19 for ; Thu, 09 Jun 2011 20:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=GQwsKbymJSef+KIjlp8+EkL+w93AEwdS4jAq2ebwZJ4=; b=dJU56fwlSm+veUxNP2l5HAaxfX5vvDy+wF7JqZ5gcZcLhQc4bDtqTzS4cI/Bd7GWxN djuZLq7bg2EMSFQpTNBiT47bYwq+BnZ09FnuykqhS/jrXgTuNp/qrTTpeZxOR5SET5NI ac+l3pD73sDV2T9BMlSB3XQdJwaFI0KL+iSFo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Qj5Jm569sgO84O34oHYKrglQWmziEMxtrwWp8aNCc4fArNsfTCJ0255R52foflqUti T9+jrcSkUJiL7LEuzLLnkEZlwOxUhKlUf7Ch+k9lpxk3E69NWe7cQvHLLzaqAp6n3Kwy CkHAI0EZleSWkcLds8cteJOG/48b3B+F+rhNY= MIME-Version: 1.0 Received: by 10.68.38.4 with SMTP id c4mr660905pbk.336.1307677559391; Thu, 09 Jun 2011 20:45:59 -0700 (PDT) Received: by 10.68.52.164 with HTTP; Thu, 9 Jun 2011 20:45:59 -0700 (PDT) In-Reply-To: References: <20110609214241.GA4849@sepie.suse.cz> Date: Thu, 9 Jun 2011 23:45:59 -0400 Message-ID: Subject: Re: [GIT] kbuild fixes for 3.0 From: Arnaud Lacombe To: Linus Torvalds Cc: Michal Marek , pefoley2@verizon.net, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 10 Jun 2011 03:46:01 +0000 (UTC) Hi, On Thu, Jun 9, 2011 at 11:37 PM, Linus Torvalds wrote: > On Thu, Jun 9, 2011 at 8:14 PM, Arnaud Lacombe 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 Date: Mon May 30 15:58:43 2011 +0200 depmod: Handle X.Y kernel versions What a stupid check. Signed-off-by: Michal Marek Signed-off-by: Jon Masters from the module-init-tools git tree. Change is pretty trivial: > 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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