Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2565841yba; Fri, 10 May 2019 14:05:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzDpWijG0E8qewC/oC0dee2cTpTPSOhZDPQAENODNt80nQdj9SI/MUmSadYZskZlNsPH2UO X-Received: by 2002:a62:5286:: with SMTP id g128mr16704436pfb.226.1557522322853; Fri, 10 May 2019 14:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557522322; cv=none; d=google.com; s=arc-20160816; b=G4JfJqoHVE7H+04NC2MUbnjdHXRO2S48m1ftt15hDyk1Il3iPT8rIgTI8mKsF0oZ3+ b+VcFpt1/XDvkzZIeOqunx6QBI542djJ2Fkvqg8SRNSR99JSUPkKcTCljqoCuOvBrIlh 3SX5LmHNaZzbidx3uRNItQx/vCY4pnELaimnjiJLMrx6czmAJJ0R1ZOTMXIrk5Ky6bS+ tUtLPCXlx1XZsv+r5YnKe7Tx/uy/r3j82iMIrfwCX/C5/0CFhvj4mMLA+uljch/TSq8X 9wY+VRNTBauJakM7KZdLOkZOpJZEcfZN4Ulbe5UfhTmEpzQgqBQfKhIOgrnN8ix1HRn2 rmxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zjB9LsovF8lpor6w+CVg9dpdpQizlQADdXWnWKh0+Rg=; b=pDo6FXP3ZOaP9UFAbFTjRxXROg786zyHZHXcNNNjKQ2EqCb7+JtXnJz2Re46YvKh5/ 7NRp6oxSxZKQGIFAhnUK2WC6GiCcYOTu3h6+E7VElGi2GlkrwR+cMNBi0EzCcUuUm7BP Yprt+IB+t2RpVXXD6sPtq3c5JFtUsodrdAj3xeDFQhFZedF+eH/b1k7A4HINuoXjGB4k 85BxW6F7ahuIIlkDifFnkOBl3wZFDtw+GrMdsi90aSQaqU3qaKMYO2mE5y5g2D4Yi1V4 EhGzBYYXIzTi2W5zIIo7B4dDUMmWqQMwGuBk9F9fVajRcSInGngUNJk+63hOVZHUUZ0m H8bA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=D9SGlVo7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f193si9474038pgc.144.2019.05.10.14.05.06; Fri, 10 May 2019 14:05:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@joelfernandes.org header.s=google header.b=D9SGlVo7; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728078AbfEJVDF (ORCPT + 99 others); Fri, 10 May 2019 17:03:05 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38375 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728063AbfEJVDE (ORCPT ); Fri, 10 May 2019 17:03:04 -0400 Received: by mail-pf1-f193.google.com with SMTP id 10so3834005pfo.5 for ; Fri, 10 May 2019 14:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zjB9LsovF8lpor6w+CVg9dpdpQizlQADdXWnWKh0+Rg=; b=D9SGlVo7Ck++vUgsqaKCetHOTba4eXxwBJsMn3w97aLNbUgfrUym6eZH5nWBabzQU+ bJDdNUxEktiLHBSD01aT4b7MJ79S8DC5r3msDBA5w4Z2KGcMKKFUBTCzOlK/B6ZdAz6L 3yZiCCGHiItEXH8/4KAuTTq0FR/DHlAqHa4LM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zjB9LsovF8lpor6w+CVg9dpdpQizlQADdXWnWKh0+Rg=; b=C8Sp1HAfwFeBipKCQZoyi9tEoAkbB7JqTrWAGJGsQqceViQwv8m37U4SzE1joUoG0H KmqIKtmFhRRLggMoPQ2tE12nvulAcxMqT7hNioqM6oOix4f8iSzyp2uwEaAQFY8ZdLc4 8sFk6+cbl/LKTaH8TIFk1jwRlOAlXi838Cm3oHZC1XTAMxt/ulYBoJ8bkv5wax4W5cRI 7JuPiThz7o32Nor3aW+oTTE91LknnGJo0rOplSEuuEHOUJ7fWl7ebHVKkRU5ClFTuxWt pMHekZSZmdQZUFjTwsQJOLbVLLA2faIgimJ9ybOi5q4F1GOQF/K/PxlEx+JGaKqg+tyi lSrg== X-Gm-Message-State: APjAAAV+2fVzPF8RWpf5PUMoZmzfXKRRc0pEOOWU7xNAZSeZZdGd29Fn 88sOSh3Ja7QFWfMBF/EMGa19y0si9jE= X-Received: by 2002:a62:470e:: with SMTP id u14mr17205590pfa.31.1557522183583; Fri, 10 May 2019 14:03:03 -0700 (PDT) Received: from joelaf.cam.corp.google.com ([2620:15c:6:12:9c46:e0da:efbf:69cc]) by smtp.gmail.com with ESMTPSA id y8sm6523333pgk.20.2019.05.10.14.02.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 10 May 2019 14:03:02 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Linus Torvalds , Adrian Ratiu , Alexei Starovoitov , Andrew Morton , atishp04@gmail.com, bpf@vger.kernel.org, Brendan Gregg , Brendan Gregg , dancol@google.com, Daniel Borkmann , Dan Williams , dietmar.eggemann@arm.com, duyuchao , gregkh@linuxfoundation.org, Guenter Roeck , Jonathan Corbet , Karim Yaghmour , Kees Cook , kernel-team@android.com, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-devel@vger.kernel.org, Manjo Raja Rao , Masahiro Yamada , Masami Hiramatsu , =?UTF-8?q?Micha=C5=82=20Gregorczyk?= , Michal Gregorczyk , Mohammad Husain , Olof Johansson , qais.yousef@arm.com, rdunlap@infradead.org, rostedt@goodmis.org, Shuah Khan , Srinivas Ramana , Tamir Carmeli , yhs@fb.com Subject: [PATCH 2/3] kheaders: Do not regenerate archive if config is not changed Date: Fri, 10 May 2019 17:02:42 -0400 Message-Id: <20190510210243.152808-3-joel@joelfernandes.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog In-Reply-To: <20190510210243.152808-1-joel@joelfernandes.org> References: <20190510210243.152808-1-joel@joelfernandes.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus reported an issue that doing an allmodconfig was causing the kheaders archive to be regenerated even though the config is the same. This patch fixes the issue by ignoring the config-related header files for "knowing when to regenerate based on timestamps". Instead, if the CONFIG_X_Y option really changes, then we there are the include/config/X/Y.h which will already tells us "if a config really changed". So we don't really need these files for regeneration detection anyway, and ignoring them fixes Linus's issue. Reported-by: Linus Torvalds Signed-off-by: Joel Fernandes (Google) --- kernel/gen_kheaders.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index 581b83534587..9a34e1d9bd7f 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -31,9 +31,8 @@ arch/$SRCARCH/include/ # This block is useful for debugging the incremental builds. # Uncomment it for debugging. -# iter=1 -# if [ ! -f /tmp/iter ]; then echo 1 > /tmp/iter; -# else; iter=$(($(cat /tmp/iter) + 1)); fi +# if [ ! -f /tmp/iter ]; then iter=1; echo 1 > /tmp/iter; +# else iter=$(($(cat /tmp/iter) + 1)); echo $iter > /tmp/iter; fi # find $src_file_list -type f | xargs ls -lR > /tmp/src-ls-$iter # find $obj_file_list -type f | xargs ls -lR > /tmp/obj-ls-$iter @@ -43,10 +42,18 @@ arch/$SRCARCH/include/ pushd $kroot > /dev/null src_files_md5="$(find $src_file_list -type f | grep -v "include/generated/compile.h" | + grep -v "include/generated/autoconf.h" | + grep -v "include/config/auto.conf" | + grep -v "include/config/auto.conf.cmd" | + grep -v "include/config/tristate.conf" | xargs ls -lR | md5sum | cut -d ' ' -f1)" popd > /dev/null obj_files_md5="$(find $obj_file_list -type f | grep -v "include/generated/compile.h" | + grep -v "include/generated/autoconf.h" | + grep -v "include/config/auto.conf" | + grep -v "include/config/auto.conf.cmd" | + grep -v "include/config/tristate.conf" | xargs ls -lR | md5sum | cut -d ' ' -f1)" if [ -f $tarfile ]; then tarfile_md5="$(md5sum $tarfile | cut -d ' ' -f1)"; fi @@ -82,7 +89,7 @@ find $cpio_dir -type f -print0 | tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null -echo "$src_files_md5" > kernel/kheaders.md5 +echo "$src_files_md5" > kernel/kheaders.md5 echo "$obj_files_md5" >> kernel/kheaders.md5 echo "$(md5sum $tarfile | cut -d ' ' -f1)" >> kernel/kheaders.md5 -- 2.21.0.1020.gf2820cf01a-goog