From patchwork Mon May 16 03:22:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 786982 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4G3NBvd017343 for ; Mon, 16 May 2011 03:23:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755530Ab1EPDXK (ORCPT ); Sun, 15 May 2011 23:23:10 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:62268 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755310Ab1EPDXJ (ORCPT ); Sun, 15 May 2011 23:23:09 -0400 Received: by iwn34 with SMTP id 34so3596925iwn.19 for ; Sun, 15 May 2011 20:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=8hwOFrmxHL2H3AP+Kb7HlMo6Wn2OudFfczuoBZcImQg=; b=PQK1M9l5Yj8Qw4s+HpEKqC4ooN61OlDxpSheJ7KWNhlQh3s1LIT0Wmz8RyVVukCHM1 xZACnZPxC0Ria/qUx1YnUvgN1d99Mp/iilkEdVHLl6w6qG8k+zoYnWSoYJIyZNJlcC6n /niMUMFx95WISnUXoRabJ6uaA0Nc3JhwzhOP0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=Ji9yg3Mvj2e6tQN6A3bkSSuUj+ilFJARKyLP5K0dHGqQdJnbe0tgwl2Dyl79A7M0Di W6+edRM95XP8Rop8kBC3LfPVI6uUKXrApLAJR2SZD3AldWyDjo2VPtTIHLk7JxBRhb57 n6/505kaxvSHiKmTQnuvgYavQdoZp0NWbyXVY= Received: by 10.42.147.65 with SMTP id m1mr1920830icv.217.1305516188682; Sun, 15 May 2011 20:23:08 -0700 (PDT) Received: from localhost.localdomain (76-10-146-236.dsl.teksavvy.com [76.10.146.236]) by mx.google.com with ESMTPS id d9sm2041660ibb.2.2011.05.15.20.23.07 (version=SSLv3 cipher=OTHER); Sun, 15 May 2011 20:23:08 -0700 (PDT) From: Arnaud Lacombe To: linux-kbuild@vger.kernel.org Cc: Michal Marek , linux-kernel@vger.kernel.org, Arnaud Lacombe Subject: [PATCH] kconfig: do not record timestamp in .config Date: Sun, 15 May 2011 23:22:56 -0400 Message-Id: <1305516176-4072-1-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.3.4.574.g608b.dirty 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]); Mon, 16 May 2011 03:23:13 +0000 (UTC) Hi Michal, The following patch removes the timestamp in .config file. This is a prerequiresite for the revised version of the printer merge I sent back in December[0]. The issue is that heading comment generations will be merged in a single function, and that would revert the deterministic change you made in mid-April. The other options are either to have timestamp always enabled and disable them selectively, but that might be a pain to implement, or to have timestamp disable by default and an environment variable, say KCONFIG_TIMESTAMP, to turn everything on manually. Regards, - Arnaud [0]: https://patchwork.kernel.org/patch/380631/ Acked-by: Michal Marek --- From: Arnaud Lacombe Subject: kconfig: do not record timestamp in .config Signed-off-by: Arnaud Lacombe --- Documentation/kbuild/kconfig.txt | 5 ----- scripts/kconfig/confdata.c | 12 +----------- 2 files changed, 1 insertions(+), 16 deletions(-) diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt index cca46b1..c313d71 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt @@ -48,11 +48,6 @@ KCONFIG_OVERWRITECONFIG If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not break symlinks when .config is a symlink to somewhere else. -KCONFIG_NOTIMESTAMP --------------------------------------------------- -If this environment variable exists and is non-null, the timestamp line -in generated .config files is omitted. - ______________________________________________________________________ Environment variables for '{allyes/allmod/allno/rand}config' diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 834eecb..2bafd9a 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -560,8 +560,6 @@ int conf_write(const char *name) const char *basename; const char *str; char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; - time_t now; - int use_timestamp = 1; char *env; dirname[0] = 0; @@ -598,19 +596,11 @@ int conf_write(const char *name) if (!out) return 1; - time(&now); - env = getenv("KCONFIG_NOTIMESTAMP"); - if (env && *env) - use_timestamp = 0; - fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" "# %s\n" - "%s%s" "#\n"), - rootmenu.prompt->text, - use_timestamp ? "# " : "", - use_timestamp ? ctime(&now) : ""); + rootmenu.prompt->text); if (!conf_get_changed()) sym_clear_all_valid();