From patchwork Mon Sep 14 21:49:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 47487 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8ELnCsf032334 for ; Mon, 14 Sep 2009 21:49:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755581AbZINVt3 (ORCPT ); Mon, 14 Sep 2009 17:49:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756200AbZINVt3 (ORCPT ); Mon, 14 Sep 2009 17:49:29 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:54463 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755581AbZINVt3 (ORCPT ); Mon, 14 Sep 2009 17:49:29 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n8ELnB3M022501 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 14 Sep 2009 14:49:12 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n8ELnBbR018743; Mon, 14 Sep 2009 14:49:11 -0700 Message-Id: <200909142149.n8ELnBbR018743@imap1.linux-foundation.org> Subject: [patch 10/18] kbuild: rebuild fix for Makefile.modbuiltin To: sam@ravnborg.org Cc: linux-kbuild@vger.kernel.org, akpm@linux-foundation.org, JBeulich@novell.com, mmarek@suse.cz From: akpm@linux-foundation.org Date: Mon, 14 Sep 2009 14:49:10 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.512 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Jan Beulich This patch addresses an issue with rebuilds failing to re-generate modules.builtin files after altering config options. Signed-off-by: Jan Beulich Signed-off-by: Michal Marek Cc: Sam Ravnborg Signed-off-by: Andrew Morton --- scripts/Makefile.modbuiltin | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff -puN scripts/Makefile.modbuiltin~kbuild-rebuild-fix-for-makefilemodbuiltin scripts/Makefile.modbuiltin --- a/scripts/Makefile.modbuiltin~kbuild-rebuild-fix-for-makefilemodbuiltin +++ a/scripts/Makefile.modbuiltin @@ -31,9 +31,13 @@ modbuiltin-cmds = \ for m in $(modbuiltin-mods); do echo kernel/$$m; done; \ cat /dev/null $(modbuiltin-subdirs); -$(modbuiltin-target): $(subdir-ym) +$(modbuiltin-target): $(subdir-ym) FORCE $(Q)($(modbuiltin-cmds)) > $@ +PHONY += FORCE + +FORCE: + # Descending # ---------------------------------------------------------------------------