From patchwork Wed Aug 26 16:28:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Maennich X-Patchwork-Id: 248413 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp4480074ils; Wed, 26 Aug 2020 09:28:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL5bfvDLdPQ0kk7Lti+QMPCLTZ3iMra06uC31EY8bB5HJ/g0nfb9XXz5ayZL+p+pt9bMF9 X-Received: by 2002:a05:6402:3102:: with SMTP id dc2mr16041753edb.152.1598459322246; Wed, 26 Aug 2020 09:28:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598459322; cv=none; d=google.com; s=arc-20160816; b=Gu5tBFLyQoKH2jEshZJGHeud++XkbblEjhmO+DU1jnGxwkQeqGzhLAH3mtjE5sKHnG qDC32z8jx8ZBTwM7Rt6Kpu2cIYiz1mLr2ZUXYCZMGKDjWAhe7UCtNU8S2W8A8Mvh62jG b7kmdx8VY0bOITsbNl1VXs+Xu0JiB+i5ug6zsCxEyOgD3DjW+XHvOxxVqDE3/dRl/V0T KKwEbdvxAnpaa+7jJE8OJLbvB6zFVFvi9GEanWLfTjdj6TmFHqqNJagWAkyJZRTKM1xH 50GuzI0Sv+QFE3Wg2ZB3xKK29iJUIUGJq6OLPpO8yHap0LmTeK8eHUZQfvF3CfcBP9nS rqfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=3gLPYefMec5H8GHlFzYJXoe4HOMZrqzA+M+p7WPcWm8=; b=q3R6JaPasWWC1AEpkblTiItaXtp4yWNWLg7A33GLts0YFnyxs0VubwInjajY3xxct5 F6dK//iDMltnD/3FnST/HU34TXLFF0ZsO0kqSa9jByk6WCENEyfVgIqjEof7VkTTNZvt TP1S7GoQJaOwvJomfGTSSXJePNmLIlOaa2yE0VLv9+T7I5WQvcpYuJiKUhZIRFahL47d gfEcewKXY9nTfhbh6W+MZtTUIcGlE68c2Tqf2AYGj6Ncgtr5pAKlvvgfs49xaxjwd/Ib 1uvETRcuzKNDNe/52IMlUt4Ln+qu/X5OgFtbQZgYvgMQd8S4kfATa+B5aGhagG5oY2Uu TJcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=cZxp+5ex; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a12si1889366eje.638.2020.08.26.09.28.42; Wed, 26 Aug 2020 09:28:42 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=cZxp+5ex; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726864AbgHZQ2k (ORCPT + 15 others); Wed, 26 Aug 2020 12:28:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728010AbgHZQ2i (ORCPT ); Wed, 26 Aug 2020 12:28:38 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5C4FC061756 for ; Wed, 26 Aug 2020 09:28:37 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id b207so2100114qkc.12 for ; Wed, 26 Aug 2020 09:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=3gLPYefMec5H8GHlFzYJXoe4HOMZrqzA+M+p7WPcWm8=; b=cZxp+5exXrwdK/i19MMaCRu5rUR3WSECshB9rYjwYBuyhy3nLzrcZTEg1FwROAkDPK K4F00SdoNsKaAGqiv8pOW57Jm8cuojHbiAJkSbgTk6/QXMvyMgS/0eqUUhVf5u3D0yT/ cWKeefqrAIQf2Qws9oOMwR2Mx5jB6XdT6BHM5QNiyXzlIfSQIsgosmUUX0ApcEJsyB0p nTVBpzWxjQw7tLaqqjHwtfIaCEDU5xjbtb7wU2qtWm+nbcjzFcyHXi9vK9Vu1qHAPcbd RaZ+YB+Q3D3hNJWTEAaiKtDskY/Gg1+XbN1KRCbWxtxQM14S6g6YREUtxmaXx5SHvjk3 7mdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3gLPYefMec5H8GHlFzYJXoe4HOMZrqzA+M+p7WPcWm8=; b=Ll7rsQWVC5pWKgwkuA/Cm4Su2bsWFOO2GtUB5S3lY5AVzXiaZIly+UwU0+7mJsXAa+ 9wm88MGJCvCvzMgwJRsBv6xtJrVne9Te9VzRhEN1K32KbBwcEbXAoL8kZmZvQVuxyesN K+iwEoNwICmTrMVdnAFw5mNWUNIXz6JiKfRSN7kUh1fmoIxkYJ0uICFQLxVKk5Cm2Eey 2caZCWsIfPH0v6OF3V4d+WL891Ts94VwSWmpcdXg4fZQKorODiu/5rWEfX28y2V+Y7bo fRdc9r4rcNzqUU/Xlxf1/TKxMrZa7IRRWudPbprYFq3NH9ovuGe3WMCvIjEtnHUB36TP VFFg== X-Gm-Message-State: AOAM53147CW2qmto/ZLzqTzlfr7map8aRSRE6JBkvk6fNS6mTxZTWs/W +s6eD1g0MzNTTXU36QWFPLM/PYd8BmIUUhA7d1f9gHUtAS/0qIS+PnGqrqk9Z/PqAdTdfeOPvWG RjS8qNcaexh2G90U+QJZUQw3PpJ3PL2AyuB2Y4O/aJmriot9qA29FwMBgu/Fkpsx9h+I= X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:110:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a0c:f74b:: with SMTP id e11mr14439994qvo.167.1598459316875; Wed, 26 Aug 2020 09:28:36 -0700 (PDT) Date: Wed, 26 Aug 2020 17:28:23 +0100 In-Reply-To: <20200826162828.3330007-1-maennich@google.com> Message-Id: <20200826162828.3330007-2-maennich@google.com> Mime-Version: 1.0 References: <20200826162828.3330007-1-maennich@google.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v5.4 1/6] kheaders: remove unneeded 'cat' command piped to 'head' / 'tail' From: Matthias Maennich To: stable@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, Denis Efremov , Masahiro Yamada , Greg Kroah-Hartman Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada The 'head' and 'tail' commands can take a file path directly. So, you do not need to run 'cat'. cat kernel/kheaders.md5 | head -1 ... is equivalent to: head -1 kernel/kheaders.md5 and the latter saves forking one process. While I was here, I replaced 'head -1' with 'head -n 1'. I also replaced '==' with '=' since we do not have a good reason to use the bashism. Signed-off-by: Masahiro Yamada (cherry picked from commit 9a066357184485784f782719093ff804d05b85db) Signed-off-by: Matthias Maennich --- kernel/gen_kheaders.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.28.0.297.g1956fa8f8d-goog diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index 5a0fc0b0403a..b8054b0d5010 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -41,10 +41,10 @@ obj_files_md5="$(find $dir_list -name "*.h" | this_file_md5="$(ls -l $sfile | md5sum | cut -d ' ' -f1)" if [ -f $tarfile ]; then tarfile_md5="$(md5sum $tarfile | cut -d ' ' -f1)"; fi if [ -f kernel/kheaders.md5 ] && - [ "$(cat kernel/kheaders.md5|head -1)" == "$src_files_md5" ] && - [ "$(cat kernel/kheaders.md5|head -2|tail -1)" == "$obj_files_md5" ] && - [ "$(cat kernel/kheaders.md5|head -3|tail -1)" == "$this_file_md5" ] && - [ "$(cat kernel/kheaders.md5|tail -1)" == "$tarfile_md5" ]; then + [ "$(head -n 1 kernel/kheaders.md5)" = "$src_files_md5" ] && + [ "$(head -n 2 kernel/kheaders.md5 | tail -n 1)" = "$obj_files_md5" ] && + [ "$(head -n 3 kernel/kheaders.md5 | tail -n 1)" = "$this_file_md5" ] && + [ "$(tail -n 1 kernel/kheaders.md5)" = "$tarfile_md5" ]; then exit fi From patchwork Wed Aug 26 16:28:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Maennich X-Patchwork-Id: 248414 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp4480120ils; Wed, 26 Aug 2020 09:28:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkpXdS8BVdam/MjLPiHv/lI2+74bl+g9SSn9TP4HJU5b95UNLrWyOJVIDhgmGEc9+LiI1c X-Received: by 2002:aa7:cfc1:: with SMTP id r1mr2319012edy.299.1598459326500; Wed, 26 Aug 2020 09:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598459326; cv=none; d=google.com; s=arc-20160816; b=cvq/UGOtfml9HxllKv1ot61rINHl7bcjP9DDsUGIfiXOrolVbbCdXF8KYJNKvCZUQc nHMqC1LI7wk9/O+UEDA22Png3aqbMoPb9nBPT2qVPiWQVLRDy3CpY/ne0ALO37pqOVNy 9fj0lo4VnWExYekGbpifQd2FjDQWTH3kDZChlJ4dvtBNruKN1IIhhGtkKgwXrVE41aVL Ty51QcRe+xP+plmHFUIB7qjK7k38XAU1BC72+KIecaNiKgo6MCaOmfgYE8MmXa0FUGCz 0PKc4+OBao5G9fbdeq1g0myQjgNxbvEy8W8bdiWqIMDkQdhaoNjia/+mQLFrABiiZ0Wd jC0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=E9ahC+bz9OJiuGWH+05TLgujNnBdc6v8wT5CCTVV9GU=; b=qT1VWcDl7ZzctFOxLW6iaJ6Cl8H+6pLXNxcz74+rNuC+goyM2bIjLKWXmhYQWjqMC1 m5DS/54GMLGejgTk/SF6AUn1yrpTZ70OHsAExJBhWJXWWErwWApvLBUPplXetyxVoUIF R+1TNjKRSTlZmat/J+xXMOAkZ8Txed3ANQoleeQg07QDnZR+cq2N0JRdDt3EXByG4mTJ BcN4AlcNKIKeGjv8NNzQo+fXccfb1JMyx/LdIPgjdsgVoApPNF/C8cBNsMrNLe2Pi97x X+5cLd/hl/wZ9w7UN2BieoRYhDifTk0s5xGX5MKzr8qOyjZryawkyqtVePL+YAdLjRNM BWQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=uB3jVsYX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a12si1889366eje.638.2020.08.26.09.28.46; Wed, 26 Aug 2020 09:28:46 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=uB3jVsYX; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728041AbgHZQ2n (ORCPT + 15 others); Wed, 26 Aug 2020 12:28:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728010AbgHZQ2m (ORCPT ); Wed, 26 Aug 2020 12:28:42 -0400 Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 421EEC061574 for ; Wed, 26 Aug 2020 09:28:41 -0700 (PDT) Received: by mail-wm1-x349.google.com with SMTP id f125so968273wma.3 for ; Wed, 26 Aug 2020 09:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=E9ahC+bz9OJiuGWH+05TLgujNnBdc6v8wT5CCTVV9GU=; b=uB3jVsYX2AtKZMEEsiPsQDWLZpGHMCuFLoYF20Vg6lYbqdutEv4sAkw/6rC8abgiP+ 0TgBw3VXPuI/1NpAncTp8QXWM3NJ7xoRj0pvhcyr3tQ4pw/CyBlwOHdnJxfxj2OIcK0l c/dTqOpeXAWDtlpHTrusUNDms2z+VzopaIQcSdxouR+rvPOUebADKedu4SSomnyTlaxa TRa41TA/mElUqvDvhWDHR8tNyNRMDxOeJ4RomD84J7j7BIoEi9E5eqFNwny8rbg3Z8OQ hALLIhgDMSkxR+4BiLdz38i0K5SMdqwgDI/HJUGeomw/ZjEshks9HKcvjET0IBvKd5ge BsYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=E9ahC+bz9OJiuGWH+05TLgujNnBdc6v8wT5CCTVV9GU=; b=JxTcFCi8ywBc1wF1HK9uJnfUS5Fc5K9cYCwT+JhlwQ9+6LtKhi96McN4IeGjnug7kd owIBJuaMejZDS/AAl6dhanvncYxxpLHypWTrSCrNaQs5AI0/Zi/UklK/t7AIDEbj9Yd9 kSfphvvsc+OimmgR6EEbImHdMcSyYqTL00Do9CWMxAMplLJXwxrkYOmAZxvGKfua4g3d 6Wy4XogmXUOBRSOJxF9jLwC56LkoJ2acz5iMZ+q/bAcD63y+ABK4JpkQK3bq/b9WaogV V6eRC0szY4JKYPM1TGEJCYmBShrX0mE8JMxikj+0YjoDQmBMKPSImi8U9gzbv+M2OuGQ 8AjQ== X-Gm-Message-State: AOAM531wz5pTCufc3VKXkJJryOXUy7AWlVCTrTbd5FyG6WDcWKv7LmFq Tni9Hin3o+dvcMOSUUJN6000SPpj25gPesLhOEOZ/KY5JFyeXBrG477LrlSOGtQ1AwR6XnRKRnr yjuqOGl8cn4uQ/2NGL63/c49HHHr4fITsv6cIm1hRqkfKTvtNq4L78uif2M0WaVB0ICg= X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:110:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a5d:638c:: with SMTP id p12mr15878484wru.17.1598459319132; Wed, 26 Aug 2020 09:28:39 -0700 (PDT) Date: Wed, 26 Aug 2020 17:28:24 +0100 In-Reply-To: <20200826162828.3330007-1-maennich@google.com> Message-Id: <20200826162828.3330007-3-maennich@google.com> Mime-Version: 1.0 References: <20200826162828.3330007-1-maennich@google.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v5.4 2/6] kheaders: optimize md5sum calculation for in-tree builds From: Matthias Maennich To: stable@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, Denis Efremov , Masahiro Yamada , Greg Kroah-Hartman Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada This script computes md5sum of headers in srctree and in objtree. However, when we are building in-tree, we know the srctree and the objtree are the same. That is, we end up with the same computation twice. In fact, the first two lines of kernel/kheaders.md5 are always the same for in-tree builds. Unify the two md5sum calculations. For in-tree builds ($building_out_of_srctree is empty), we check only two directories, "include", and "arch/$SRCARCH/include". For out-of-tree builds ($building_out_of_srctree is 1), we check 4 directories, "$srctree/include", "$srctree/arch/$SRCARCH/include", "include", and "arch/$SRCARCH/include" since we know they are all different. Signed-off-by: Masahiro Yamada (cherry picked from commit 0e11773e76098729552b750ccff79374d1e62002) Signed-off-by: Matthias Maennich --- kernel/gen_kheaders.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) -- 2.28.0.297.g1956fa8f8d-goog diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index b8054b0d5010..6ff86e62787f 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -21,29 +21,30 @@ arch/$SRCARCH/include/ # Uncomment it for debugging. # 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 -name "*.h" | xargs ls -l > /tmp/src-ls-$iter -# find $obj_file_list -name "*.h" | xargs ls -l > /tmp/obj-ls-$iter +# find $all_dirs -name "*.h" | xargs ls -l > /tmp/ls-$iter + +all_dirs= +if [ "$building_out_of_srctree" ]; then + for d in $dir_list; do + all_dirs="$all_dirs $srctree/$d" + done +fi +all_dirs="$all_dirs $dir_list" # include/generated/compile.h is ignored because it is touched even when none # of the source files changed. This causes pointless regeneration, so let us # ignore them for md5 calculation. -pushd $srctree > /dev/null -src_files_md5="$(find $dir_list -name "*.h" | - grep -v "include/generated/compile.h" | - grep -v "include/generated/autoconf.h" | - xargs ls -l | md5sum | cut -d ' ' -f1)" -popd > /dev/null -obj_files_md5="$(find $dir_list -name "*.h" | - grep -v "include/generated/compile.h" | - grep -v "include/generated/autoconf.h" | +headers_md5="$(find $all_dirs -name "*.h" | + grep -v "include/generated/compile.h" | + grep -v "include/generated/autoconf.h" | xargs ls -l | md5sum | cut -d ' ' -f1)" + # Any changes to this script will also cause a rebuild of the archive. this_file_md5="$(ls -l $sfile | md5sum | cut -d ' ' -f1)" if [ -f $tarfile ]; then tarfile_md5="$(md5sum $tarfile | cut -d ' ' -f1)"; fi if [ -f kernel/kheaders.md5 ] && - [ "$(head -n 1 kernel/kheaders.md5)" = "$src_files_md5" ] && - [ "$(head -n 2 kernel/kheaders.md5 | tail -n 1)" = "$obj_files_md5" ] && - [ "$(head -n 3 kernel/kheaders.md5 | tail -n 1)" = "$this_file_md5" ] && + [ "$(head -n 1 kernel/kheaders.md5)" = "$headers_md5" ] && + [ "$(head -n 2 kernel/kheaders.md5 | tail -n 1)" = "$this_file_md5" ] && [ "$(tail -n 1 kernel/kheaders.md5)" = "$tarfile_md5" ]; then exit fi @@ -79,8 +80,7 @@ find $cpio_dir -printf "./%P\n" | LC_ALL=C sort | \ --owner=0 --group=0 --numeric-owner --no-recursion \ -Jcf $tarfile -C $cpio_dir/ -T - > /dev/null -echo "$src_files_md5" > kernel/kheaders.md5 -echo "$obj_files_md5" >> kernel/kheaders.md5 +echo $headers_md5 > kernel/kheaders.md5 echo "$this_file_md5" >> kernel/kheaders.md5 echo "$(md5sum $tarfile | cut -d ' ' -f1)" >> kernel/kheaders.md5 From patchwork Wed Aug 26 16:28:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Maennich X-Patchwork-Id: 248415 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp4480249ils; Wed, 26 Aug 2020 09:28:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5H61vMsFyh8mCho3hFqMzAyAE4h9X8i7naUzjGQvpRUGwe0bPlMW2neNGOebe8450TnmM X-Received: by 2002:a17:906:2bdb:: with SMTP id n27mr17016438ejg.12.1598459337371; Wed, 26 Aug 2020 09:28:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598459337; cv=none; d=google.com; s=arc-20160816; b=F9akR9pyc32I7DIUNL0eXl395p1Idbd2igfvG+OS1DfNjl7JpkOiJKM6Y0MU67YXpV YatmdCopghbj511GxnVGQuC6TxX2OLAp7AmJXhIDYlyqNCzvSslAPKtvS345Wo5efdpk W7VZLEqumLwjNeIRLMgybahGqw5L0m3NO+dV8uGWAAYdllkdV6lHPrzgIFkYv7YKPnZP sGa3+QHgUVk5anT0qSZH5jsSuspSsIqnFkjcArjg6Z31IbFLpmo4TnDHPaygtU611Lh/ w+Swu05fdfkXfUDAmcWYn/064HC7YQ6+jdIq/sg2tbXgtsf7dU8AERPFyrjN4gNmDmKQ zd9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=wC5wqDfuf+saZxph+SX8sbdo9xJEXrFL2V59EV+AaBQ=; b=nyotQEkysXdAT1JtUBDFEtOiio0MmV7ths3HoBqusnF/tPXl0UEP1E6wiY2kGNzLPO BoMQjEVX3bXs+vgmhP5KD8cuU9l418reUkL7XbqqiKffw8WXWpT0Q+3ZWuXQSeerKMB6 vTR1e+3Ked8OXg5vGDnINBBpfhza+0u5lwb/qBJbLAqtrYkXC145HavY6MYKvsDy6j3I D0qEP9uayDHXc6ARzuh2fdxdxLRdPQ2t8/0ZeOBOUj64/QvhgsWw4jLFQilHDk7VahQH m8qEHp4+FsNZQkI3LSlb5Z5brqwpB43xmVYnAbeQySc0XEbGkJoqHQMxY4FY8IagX9/y eLiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=g4qQ3iTG; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a12si1889366eje.638.2020.08.26.09.28.57; Wed, 26 Aug 2020 09:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=g4qQ3iTG; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728052AbgHZQ24 (ORCPT + 15 others); Wed, 26 Aug 2020 12:28:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728010AbgHZQ2p (ORCPT ); Wed, 26 Aug 2020 12:28:45 -0400 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F7ABC061574 for ; Wed, 26 Aug 2020 09:28:44 -0700 (PDT) Received: by mail-wm1-x34a.google.com with SMTP id q23so972642wmj.0 for ; Wed, 26 Aug 2020 09:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=wC5wqDfuf+saZxph+SX8sbdo9xJEXrFL2V59EV+AaBQ=; b=g4qQ3iTG32xCzJKBJ2zbBeDT7UAk4pTAauSx2VxMxdWkJeLVY51KaKnfU9QssWDN7S F3DV2W1qNSH6UgH6HPpe+SYILOv4lU/RSCG99tZ9tlnfspTEhpd3gEsLxwaM2UmC0RhC 9bD4mATXtZicirrXW+a1Bl4fnqzeOCJe8jHJRg5ExGFYirtAnWmaxC1mPzAZv0aT/aHp ZMIEvRRvOfOIquOmBPr+A9asz/KY1+IjTxdb+Ir5IcVFy7Qb2ITW0scyZcOgtFsycfRU UWcuNMs2qg+h5QtN85y8MEigLEHFmunQB7hnUIOeOSWtT8ogipGXVV7hix4fX+IK5Gxw qwpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=wC5wqDfuf+saZxph+SX8sbdo9xJEXrFL2V59EV+AaBQ=; b=RaxqDIeQzM3BefaKTNdD7Wx4kIz97UqQkmAcDFN6wqijURfl7L6Iz+LAP5zTyIXthv EnpkU4sfKsD3sjpITlFg1aQTJScFgoAffwHkthLdbTOnEOhwa6IcSWgFxvQVd/6staFw rj6dGWoqFDlTUGbD3NbKLs74kskDTvyYODS8s4JqVdRHLi1DUAH09Fs5tvKsoYNlIJOD 4AT/ukbF1txT9GybpRkKto98fhXbUn3QBuyJSZF9o6MRm9rzPnicNtYu/XXqJYwALIJ2 uccElZHbRHeyk+YdkkyeJRVLJ2BfAuz7n25y0WkJbPD3OdVbgD9NOOl21Us7uXjnbVNY zWgQ== X-Gm-Message-State: AOAM532SVL7Tpthw3WxtkCkVdw2PyPaad+Ot3kmH1FVhds38zMiHWJQk 3flsciIsbD/8rEpnDvBo8+XFGRs6zBMyiPdPy15X683KskHNAcGYvIxK/JylRmmZTTgcQsdKqYt KMfj5lH1ip2ccCmOQKOkeIjTRrh0n6LH2p9CzCd1D5qKgHhdlWcwrWJ+goL3fjKIWwsI= X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:110:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a7b:c019:: with SMTP id c25mr210876wmb.0.1598459321617; Wed, 26 Aug 2020 09:28:41 -0700 (PDT) Date: Wed, 26 Aug 2020 17:28:25 +0100 In-Reply-To: <20200826162828.3330007-1-maennich@google.com> Message-Id: <20200826162828.3330007-4-maennich@google.com> Mime-Version: 1.0 References: <20200826162828.3330007-1-maennich@google.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v5.4 3/6] kheaders: optimize header copy for in-tree builds From: Matthias Maennich To: stable@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, Denis Efremov , Masahiro Yamada , Greg Kroah-Hartman Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada This script copies headers by the cpio command twice; first from srctree, and then from objtree. However, when we building in-tree, we know the srctree and the objtree are the same. That is, all the headers copied by the first cpio are overwritten by the second one. Skip the first cpio when we are building in-tree. Signed-off-by: Masahiro Yamada (cherry picked from commit ea79e5168be644fdaf7d4e6a73eceaf07b3da76a) Signed-off-by: Matthias Maennich --- kernel/gen_kheaders.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) -- 2.28.0.297.g1956fa8f8d-goog diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index 6ff86e62787f..0f7752dd93a6 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -56,14 +56,16 @@ fi rm -rf $cpio_dir mkdir $cpio_dir -pushd $srctree > /dev/null -for f in $dir_list; - do find "$f" -name "*.h"; -done | cpio --quiet -pd $cpio_dir -popd > /dev/null +if [ "$building_out_of_srctree" ]; then + pushd $srctree > /dev/null + for f in $dir_list + do find "$f" -name "*.h"; + done | cpio --quiet -pd $cpio_dir + popd > /dev/null +fi -# The second CPIO can complain if files already exist which can -# happen with out of tree builds. Just silence CPIO for now. +# The second CPIO can complain if files already exist which can happen with out +# of tree builds having stale headers in srctree. Just silence CPIO for now. for f in $dir_list; do find "$f" -name "*.h"; done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1 From patchwork Wed Aug 26 16:28:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Maennich X-Patchwork-Id: 248416 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp4480255ils; Wed, 26 Aug 2020 09:28:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMjprxxLjh1Fs2+5n9pfRhnWlhwok3Df3DTRw+p63Ybq6PdBjz4v8Yuvh/Rn5j4uf8O0F4 X-Received: by 2002:a17:906:274d:: with SMTP id a13mr13218678ejd.434.1598459338157; Wed, 26 Aug 2020 09:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598459338; cv=none; d=google.com; s=arc-20160816; b=XiPrZXW0+AlhNoq8Nm7Znbx33Qdf/ApMz03U4f4T/sCbkji1xVVWemLuhDmXOXKqmm NOEab+fVfq7/hliHoks0Zczmh/ui8EwZF8FUDQwapU6i6kmnRn56TaMBwjYUIh7quf4b 1crSuKk38y6ipW3fPxZJ2NHtb8xscU4NEiUf0JGEHCts5lcpVPn4i2u+3GIY/ED2iLLm Arl+h8k7zEAJ9v2MWKQzUdhw/Hi5rX6c4BE80c+yzb8xSQAP6Ls0u8kgNLLxhuREGqPF +f31hZk1LU/qqAM6AuWz5ybH3nljHRpwmvGpXvSpvpuvblrJtVnY9+H2L9XyZTomhgnx 0Iwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=ktgwgtEcDnGHDubc6AjOIa3QJevlYyX2Xfy7+GppRf0=; b=lJ1NHuwiQbVGDVXNTLXvSINFamyZhN4KkcIoY6XBVhDjDkn4+UrNfjxcSLSntm5vzO LP2lY3GOz4t6dE7B1KHTGMZcVCQXyAGT0umf9BncejSXypJbsuVHWWlgIzrUg+mY4nh7 21urj4vI5gEXBfgLYTZW8SitR003TxKnq93bCSeF7U8b9EKCawiRqiPpEUFlIJVWVgBV sogoOoK5lEdav9LS0zcSq/ibp64CN2YGxNqyWfQIJwVe8oYh71XI6TQPOV8vHHpwQYgf XQOqaWtTkBrVaY9Kl+eCQgzfk2qo33FjQekUdAEMGwdWMbKhonMG+2PDoDo4FBHUgAwC 73wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=pR+ftzKg; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a12si1889366eje.638.2020.08.26.09.28.57; Wed, 26 Aug 2020 09:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=pR+ftzKg; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728010AbgHZQ24 (ORCPT + 15 others); Wed, 26 Aug 2020 12:28:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728047AbgHZQ2p (ORCPT ); Wed, 26 Aug 2020 12:28:45 -0400 Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F6F0C061756 for ; Wed, 26 Aug 2020 09:28:45 -0700 (PDT) Received: by mail-wm1-x349.google.com with SMTP id p23so967198wmc.2 for ; Wed, 26 Aug 2020 09:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=ktgwgtEcDnGHDubc6AjOIa3QJevlYyX2Xfy7+GppRf0=; b=pR+ftzKgbzQBiJkPHA17spJ9YB2ynvQyURBHLX2DqwfOyvhUW9KBer14jJHl6NwdD2 F2x7plHLT0OQFzWU1eDIb2X5YpzBvRFVKIA00mEW2IxnWg6wgvQhFzH46kS6zTaLL0KY qxXesZTHhQWZj5QrqQrFuqyInw4nqDbhXrf4sWNIUrY+d9HdkKyVKxGBvrslX8wqobV2 xZN1hth76CVuh+mxaKC+ec6iCCoLIq9YpHX/XqTP3BJBeSQ+aoDZ0q4iP9Z4VF8kSSpX z1BSVNWYTD8STbaHVkK+yjaMaFcRarJ4+iw6F/2U06DYjPXwTJk8es0dTZnruwPXkbQI NOeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ktgwgtEcDnGHDubc6AjOIa3QJevlYyX2Xfy7+GppRf0=; b=opBZrwrbV4DuLwR8Vp9/CAvoGGKWoz8iDnoJqOay+6ivjSCaQeej3cWRMTdU8hmPyK +u4ycN84rBwdH6KGhG38UstWTayTfCH2FhAZvCdDrQRh5PuBGBsrSKnRMnnJQsP7t7JB 3zKwCgwpS3tKIW6uppK/gbsrzYJnbo6Kwae2wQNeQd68RoYBJkSTDCqLrZ8nNBcIbQTM i4kTefIGfYhYm/owBFtbhUCYMiHBUHnzCR5ES3mIYfMBYGLusWAvi+LwRCFuKXCAaf20 29CTg7ujAqEakXVbIHPKgzfBkSmuVyX/jOGTv4zD8hv6lIPDmPPOY5z7lCEKXvdtauFE GuMQ== X-Gm-Message-State: AOAM532GCdBB0YQQjVZAsLTnioF1Ol5O1guC1RQm25ZDxkxStHuS2HHf IYdQ+ML8pBZM5+cTHRlCo30f46HGBksX7JQEMmPn1z00evEgrdSD2Oo8IzqOi9x/LMLngCOwaAi 1vlne6q7JVT5pMdC9m2EAR+4zsEdgviaRBMtSZb8Pd2sNjwVqychnCgGknQRSJeLny7I= X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:110:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a5d:540f:: with SMTP id g15mr8472392wrv.130.1598459324001; Wed, 26 Aug 2020 09:28:44 -0700 (PDT) Date: Wed, 26 Aug 2020 17:28:26 +0100 In-Reply-To: <20200826162828.3330007-1-maennich@google.com> Message-Id: <20200826162828.3330007-5-maennich@google.com> Mime-Version: 1.0 References: <20200826162828.3330007-1-maennich@google.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v5.4 4/6] kheaders: remove the last bashism to allow sh to run it From: Matthias Maennich To: stable@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, Denis Efremov , Masahiro Yamada , Greg Kroah-Hartman Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada 'pushd' ... 'popd' is the last bash-specific code in this script. One way to avoid it is to run the code in a sub-shell. With that addressed, you can run this script with sh. I replaced $(BASH) with $(CONFIG_SHELL), and I changed the hashbang to #!/bin/sh. Signed-off-by: Masahiro Yamada (cherry picked from commit 1463f74f492eea7191f0178e01f3d38371a48210) Signed-off-by: Matthias Maennich --- kernel/Makefile | 2 +- kernel/gen_kheaders.sh | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) -- 2.28.0.297.g1956fa8f8d-goog diff --git a/kernel/Makefile b/kernel/Makefile index daad787fb795..42557f251fea 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -128,7 +128,7 @@ $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE $(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz - cmd_genikh = $(BASH) $(srctree)/kernel/gen_kheaders.sh $@ + cmd_genikh = $(CONFIG_SHELL) $(srctree)/kernel/gen_kheaders.sh $@ $(obj)/kheaders_data.tar.xz: FORCE $(call cmd,genikh) diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index 0f7752dd93a6..dc5744b93f8c 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # SPDX-License-Identifier: GPL-2.0 # This script generates an archive consisting of kernel headers @@ -57,11 +57,12 @@ rm -rf $cpio_dir mkdir $cpio_dir if [ "$building_out_of_srctree" ]; then - pushd $srctree > /dev/null - for f in $dir_list - do find "$f" -name "*.h"; - done | cpio --quiet -pd $cpio_dir - popd > /dev/null + ( + cd $srctree + for f in $dir_list + do find "$f" -name "*.h"; + done | cpio --quiet -pd $cpio_dir + ) fi # The second CPIO can complain if files already exist which can happen with out From patchwork Wed Aug 26 16:28:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Maennich X-Patchwork-Id: 248417 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp4480260ils; Wed, 26 Aug 2020 09:28:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYcDiZzgPiV0E5orJVH3ZAFsvN2cXfdT8Uqw0E9k9MQ68C9sLtlF2eFH1VhJax23mHg3Xl X-Received: by 2002:a50:8f85:: with SMTP id y5mr15891748edy.233.1598459338808; Wed, 26 Aug 2020 09:28:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598459338; cv=none; d=google.com; s=arc-20160816; b=AEgNT3GQvTM1wtP+MvNQZatIgKx1tW3yahtwiKJXq6sfUG5ax1QRynddHwOUIzrfRs y3GTpA2tdzAEw2bMYcu01ylYC/gvG+QNh2tSqQ2fnH/orQL7ZNR91gJXjWjisffjDwXH kf4Sxdjy3B6KhLBm4G3Loyxs2858nz6m3sWitPApgVhq8FiA+BhEks1NBpX9jRj5ob8l RXhfHnauPUfJqt2oRZ7mmSdCsheRDiWeRBkGPYpE/uJM6n+6uqcMwzUygEVC/Xilxm2P P0ATyQYOa/L+gZ1AD8ognaj5e3ulLpfmQN3Xa+Nio9jLfhqb/gTp0UK3wfgAh1dI58o1 VoWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=LHfpllJunTUfMKFidc/MV08iSyGLSotXc/21SDTzF6s=; b=0BPSTgeMfvo9sF9tAKwCMewAhRg6ftTFLEFJTGJMZNT1OYANeLG2gv4J/BHkqUxtJx GsHoac9HE83ALiBIhKpmdm9Nc4ejBwFG1ta346bxoQI46BgKC06NwEpYKgpxRxRI+mA1 X1Rtjo+z65y/HUze1LR9ttNw/jjUMYsVlOnFpJCORzjhq2JSsfYzN4FsW/GHS/MYdZ9C o3nSfoN4NOLMlggXlZy9GsOLg2MkOn9zYbcS7C58rt+yvdJPsbHqKRAw46H6OvLUL3U4 TipbEhXnEJ8ZbUdKAXqmVdH0s82PZM5GdSHZNk7KfJdmY2HlJni21vgKvZz8e4QPD9JU sTdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=RSLvoOAT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a12si1889366eje.638.2020.08.26.09.28.58; Wed, 26 Aug 2020 09:28:58 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@google.com header.s=20161025 header.b=RSLvoOAT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=REJECT sp=REJECT dis=QUARANTINE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728047AbgHZQ25 (ORCPT + 15 others); Wed, 26 Aug 2020 12:28:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728048AbgHZQ2t (ORCPT ); Wed, 26 Aug 2020 12:28:49 -0400 Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FF9FC061757 for ; Wed, 26 Aug 2020 09:28:48 -0700 (PDT) Received: by mail-wr1-x44a.google.com with SMTP id u10so703218wrp.3 for ; Wed, 26 Aug 2020 09:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=LHfpllJunTUfMKFidc/MV08iSyGLSotXc/21SDTzF6s=; b=RSLvoOATp/ovUC+Lxmu/zridwfnbtxW+mR8KrlBueYegr+97YFVuj39rWmvdYAAs+z QpFkdf2N04I8asggCEuZ/oykvZ2FPJVEWUDjWQ+h2ASEBGOH/gZf3logHPRNY8/fBSMh ByPFDM69yB08o93cGxFUTDgo3MAQ4jPu6Zr+5wCEcIIVmL+nS8CTTNsp3fXSgCwUtUph jDM6LBEtvFtDyIPjaQnGW7VfjqfT+GRgHi9XMIIHjQE++9XA3k6QAD0zj7uHmNpmzGDd QF6ZcRxL+Mjxxy61ERrDF6XmQ2TRf8/QQIM/THulJDOIDUmg7zOsDnOl7D7BpnsSw3+X qCLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LHfpllJunTUfMKFidc/MV08iSyGLSotXc/21SDTzF6s=; b=B2yxINSmhFMtcsfcNx4rfDiESZ533hnSB/5bVJ784lgHH9lVBwjJPpHzMmkEtmyZoR nHv1BDh2+7V1mhYCn1Jm1ii/z7UVmfIMZHx9uggTBWC7VK6wn6h1CkE0qKfLEgY9nVxE 1+6E7WYiLRcjk/FrSDTm6hOCCccqrUYhj+MJLI1OwUZc439sRqR4oUp+B9ZUIJDoOGub CbZ4GeKcOAV5bOMS6eEvLf5xJUYsUjXu5adWuGN5ACKeQ6yRcyahsWHAbhoObH9zdzIn 24jdv1SYag7154Gf4dx2otrZws6Zq+F3ylMXNbPS8vYf02S60OGVeJYxOFdtJd0uLngp 8CJw== X-Gm-Message-State: AOAM533BvWRewm/AmQnqn9rijJvnkKTzmrvVlk+IXWSG3IknJTh0Yrv8 E8wOshBTtb+YJDJe/NtstpAIF5o7FGX7mZljIeJQKXyBy1/t6jNlaQEnjIAHqccjwUwOtiTeaAB 7fdewg3XbDpMdsilR1+sa1lifmGJ0c7KrrVFKyEhY5PdEz/Ak0T1YdcudH8Z27F8lXpw= X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:110:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:adf:de8d:: with SMTP id w13mr15948143wrl.129.1598459326188; Wed, 26 Aug 2020 09:28:46 -0700 (PDT) Date: Wed, 26 Aug 2020 17:28:27 +0100 In-Reply-To: <20200826162828.3330007-1-maennich@google.com> Message-Id: <20200826162828.3330007-6-maennich@google.com> Mime-Version: 1.0 References: <20200826162828.3330007-1-maennich@google.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v5.4 5/6] kheaders: explain why include/config/autoconf.h is excluded from md5sum From: Matthias Maennich To: stable@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, Denis Efremov , Masahiro Yamada , Greg Kroah-Hartman Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada This comment block explains why include/generated/compile.h is omitted, but nothing about include/generated/autoconf.h, which might be more difficult to understand. Add more comments. Signed-off-by: Masahiro Yamada (cherry picked from commit f276031b4e2f4c961ed6d8a42f0f0124ccac2e09) Signed-off-by: Matthias Maennich --- kernel/gen_kheaders.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.28.0.297.g1956fa8f8d-goog diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index dc5744b93f8c..e13ca842eb7e 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -32,8 +32,15 @@ fi all_dirs="$all_dirs $dir_list" # include/generated/compile.h is ignored because it is touched even when none -# of the source files changed. This causes pointless regeneration, so let us -# ignore them for md5 calculation. +# of the source files changed. +# +# When Kconfig regenerates include/generated/autoconf.h, its timestamp is +# updated, but the contents might be still the same. When any CONFIG option is +# changed, Kconfig touches the corresponding timestamp file include/config/*.h. +# Hence, the md5sum detects the configuration change anyway. We do not need to +# check include/generated/autoconf.h explicitly. +# +# Ignore them for md5 calculation to avoid pointless regeneration. headers_md5="$(find $all_dirs -name "*.h" | grep -v "include/generated/compile.h" | grep -v "include/generated/autoconf.h" | From patchwork Wed Aug 26 16:28:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Maennich X-Patchwork-Id: 264877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FC24C433E3 for ; Wed, 26 Aug 2020 16:28:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B84820825 for ; Wed, 26 Aug 2020 16:28:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="G5W+/Os1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728048AbgHZQ25 (ORCPT ); Wed, 26 Aug 2020 12:28:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728049AbgHZQ2v (ORCPT ); Wed, 26 Aug 2020 12:28:51 -0400 Received: from mail-qv1-xf49.google.com (mail-qv1-xf49.google.com [IPv6:2607:f8b0:4864:20::f49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E7A8C0613ED for ; Wed, 26 Aug 2020 09:28:50 -0700 (PDT) Received: by mail-qv1-xf49.google.com with SMTP id q12so1972888qvm.19 for ; Wed, 26 Aug 2020 09:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=8H3XgcOmOoNvmSuV4rJYIDWpnf3ENBRg6T4MvewnKfk=; b=G5W+/Os1+dJjHutoktb9Rh9Um3081d+ky2OMn4cpewJHI1FpkqUBduFEJsRLq1cFHi /yYwghFjr7BQ0LV7hy5/+8xdsBImX18vmoJ7hYV+v7GnN15hsH+AnMO5j6BzdRqdgAIS qW+BCtgIuocKtr2G1YGT41nwhOEHXvxa9a+S4+gOQkMIWBJ4UmHDyndTL2iDLylOYw4L xAPec0M3N+mgmJqsq3p/7bR32CZnbutojgaEgj5SMtHTpdpaT9jr2wjNnWZ8rYeBrMCr oAOl5vspbVmI9WndfBtKQzFNpgUiriBmp5vEPBUaRGhjWLpZXd/KyL2VwFS4Hng57eUb 3H7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=8H3XgcOmOoNvmSuV4rJYIDWpnf3ENBRg6T4MvewnKfk=; b=S4JZicye1UXgzF4pQ2ORpi7gCWmapsyTc0ipirX/d63tZoK2Bce4ItXROmC4249Zs4 cHddG+bZof4y4rI8CLkWQiN5l1cA6NiIsSFv+MGaV6ugXShuCIqpI7Hl4snV27KRE57Z R45Id9kBlWUu6/6IUkENjnahI3NxpHtg7zfaj/CFYdHONgW0ZVZaWM12Pn1paIJYnuXr PvD74/WW6FSjgZEDbkLJU7b1JVpbmeVplEvtxUhvcVXu3sPAqUhRMgDPsDn9FJjw0cWN EkrNo8Yg62mQ24eDYtOkCOxm6obpdPjYullNk/juaTLG0wbSkmMshU5SwpeAjfaaviwh sKiw== X-Gm-Message-State: AOAM533HRYAUkeo4R2ME/QYbB30X5ozdS1UhcZiiw4A+5kcmR9AOZGfD NLq9ZJqjts1p99EH67kSO1q/t7PkEvoCCQrEAnN27cXwOSCUfVJK0b29ZHXh/W9p2XpPGkmJQn6 hOZAodIFq++fFB1cHQph6RK24XfEfopPamJ7k4hoCif4oe4OUrCEXlNBZi+ToWaeV5EE= X-Google-Smtp-Source: ABdhPJzCxcgLjK7AkhHxNklENdUDcsE1JXkq/LcyK3DEGu/oPnXuReLIWXgJGrvtabvv7Yv0IzBKZCJvgQ3USg== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:110:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:ad4:4365:: with SMTP id u5mr14710124qvt.109.1598459328397; Wed, 26 Aug 2020 09:28:48 -0700 (PDT) Date: Wed, 26 Aug 2020 17:28:28 +0100 In-Reply-To: <20200826162828.3330007-1-maennich@google.com> Message-Id: <20200826162828.3330007-7-maennich@google.com> Mime-Version: 1.0 References: <20200826162828.3330007-1-maennich@google.com> X-Mailer: git-send-email 2.28.0.297.g1956fa8f8d-goog Subject: [PATCH v5.4 6/6] kbuild: add variables for compression tools From: Matthias Maennich To: stable@vger.kernel.org Cc: kernel-team@android.com, maennich@google.com, Denis Efremov , Masahiro Yamada , Greg Kroah-Hartman , Masahiro Yamada Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Denis Efremov Allow user to use alternative implementations of compression tools, such as pigz, pbzip2, pxz. For example, multi-threaded tools to speed up the build: $ make GZIP=pigz BZIP2=pbzip2 Variables _GZIP, _BZIP2, _LZOP are used internally because original env vars are reserved by the tools. The use of GZIP in gzip tool is obsolete since 2015. However, alternative implementations (e.g., pigz) still rely on it. BZIP2, BZIP, LZOP vars are not obsolescent. The credit goes to @grsecurity. As a sidenote, for multi-threaded lzma, xz compression one can use: $ export XZ_OPT="--threads=0" Signed-off-by: Denis Efremov Signed-off-by: Masahiro Yamada (cherry picked from commit 8dfb61dcbaceb19a5ded5e9c9dcf8d05acc32294) Signed-off-by: Matthias Maennich Change-Id: Idaa5daac69c820c78e32b4630f3d72739e74be12 --- Makefile | 25 +++++++++++++++++++++++-- arch/arm/boot/deflate_xip_data.sh | 2 +- arch/ia64/Makefile | 2 +- arch/m68k/Makefile | 8 ++++---- arch/parisc/Makefile | 2 +- kernel/gen_kheaders.sh | 2 +- scripts/Makefile.lib | 12 ++++++------ scripts/Makefile.package | 8 ++++---- scripts/package/buildtar | 6 +++--- scripts/xz_wrap.sh | 2 +- 10 files changed, 45 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 7c001e21e28e..3521ba6097a7 100644 --- a/Makefile +++ b/Makefile @@ -426,6 +426,26 @@ PYTHON2 = python2 PYTHON3 = python3 CHECK = sparse BASH = bash +GZIP = gzip +BZIP2 = bzip2 +LZOP = lzop +LZMA = lzma +LZ4 = lz4c +XZ = xz + +# GZIP, BZIP2, LZOP env vars are used by the tools. Support them as the command +# line interface, but use _GZIP, _BZIP2, _LZOP internally. +_GZIP := $(GZIP) +_BZIP2 := $(BZIP2) +_LZOP := $(LZOP) + +# Reset GZIP, BZIP2, LZOP in this Makefile +override GZIP= +override BZIP2= +override LZOP= + +# Reset GZIP, BZIP2, LZOP in recursive invocations +MAKEOVERRIDES += GZIP= BZIP2= LZOP= CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF) @@ -474,6 +494,7 @@ CLANG_FLAGS := export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE PAHOLE LEX YACC AWK INSTALLKERNEL export PERL PYTHON PYTHON2 PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX +export _GZIP _BZIP2 _LZOP LZMA LZ4 XZ export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS @@ -981,10 +1002,10 @@ export mod_strip_cmd mod_compress_cmd = true ifdef CONFIG_MODULE_COMPRESS ifdef CONFIG_MODULE_COMPRESS_GZIP - mod_compress_cmd = gzip -n -f + mod_compress_cmd = $(_GZIP) -n -f endif # CONFIG_MODULE_COMPRESS_GZIP ifdef CONFIG_MODULE_COMPRESS_XZ - mod_compress_cmd = xz -f + mod_compress_cmd = $(XZ) -f endif # CONFIG_MODULE_COMPRESS_XZ endif # CONFIG_MODULE_COMPRESS export mod_compress_cmd diff --git a/arch/arm/boot/deflate_xip_data.sh b/arch/arm/boot/deflate_xip_data.sh index 40937248cebe..739f0464321e 100755 --- a/arch/arm/boot/deflate_xip_data.sh +++ b/arch/arm/boot/deflate_xip_data.sh @@ -56,7 +56,7 @@ trap 'rm -f "$XIPIMAGE.tmp"; exit 1' 1 2 3 # substitute the data section by a compressed version $DD if="$XIPIMAGE" count=$data_start iflag=count_bytes of="$XIPIMAGE.tmp" $DD if="$XIPIMAGE" skip=$data_start iflag=skip_bytes | -gzip -9 >> "$XIPIMAGE.tmp" +$_GZIP -9 >> "$XIPIMAGE.tmp" # replace kernel binary mv -f "$XIPIMAGE.tmp" "$XIPIMAGE" diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 32240000dc0c..f817f3d5e758 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -40,7 +40,7 @@ $(error Sorry, you need a newer version of the assember, one that is built from endif quiet_cmd_gzip = GZIP $@ -cmd_gzip = cat $(real-prereqs) | gzip -n -f -9 > $@ +cmd_gzip = cat $(real-prereqs) | $(_GZIP) -n -f -9 > $@ quiet_cmd_objcopy = OBJCOPY $@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index 5d9288384096..ce6db5e5a5a3 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -135,10 +135,10 @@ vmlinux.gz: vmlinux ifndef CONFIG_KGDB cp vmlinux vmlinux.tmp $(STRIP) vmlinux.tmp - gzip -9c vmlinux.tmp >vmlinux.gz + $(_GZIP) -9c vmlinux.tmp >vmlinux.gz rm vmlinux.tmp else - gzip -9c vmlinux >vmlinux.gz + $(_GZIP) -9c vmlinux >vmlinux.gz endif bzImage: vmlinux.bz2 @@ -148,10 +148,10 @@ vmlinux.bz2: vmlinux ifndef CONFIG_KGDB cp vmlinux vmlinux.tmp $(STRIP) vmlinux.tmp - bzip2 -1c vmlinux.tmp >vmlinux.bz2 + $(_BZIP2) -1c vmlinux.tmp >vmlinux.bz2 rm vmlinux.tmp else - bzip2 -1c vmlinux >vmlinux.bz2 + $(_BZIP2) -1c vmlinux >vmlinux.bz2 endif archclean: diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 36b834f1c933..ad4ba8b5d1e4 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -156,7 +156,7 @@ vmlinuz: bzImage $(OBJCOPY) $(boot)/bzImage $@ else vmlinuz: vmlinux - @gzip -cf -9 $< > $@ + @$(_GZIP) -cf -9 $< > $@ endif install: diff --git a/kernel/gen_kheaders.sh b/kernel/gen_kheaders.sh index e13ca842eb7e..c1510f0ab3ea 100755 --- a/kernel/gen_kheaders.sh +++ b/kernel/gen_kheaders.sh @@ -88,7 +88,7 @@ find $cpio_dir -type f -print0 | find $cpio_dir -printf "./%P\n" | LC_ALL=C sort | \ tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \ --owner=0 --group=0 --numeric-owner --no-recursion \ - -Jcf $tarfile -C $cpio_dir/ -T - > /dev/null + -I $XZ -cf $tarfile -C $cpio_dir/ -T - > /dev/null echo $headers_md5 > kernel/kheaders.md5 echo "$this_file_md5" >> kernel/kheaders.md5 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 342618a2bccb..75d3684aceec 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -230,7 +230,7 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ # --------------------------------------------------------------------------- quiet_cmd_gzip = GZIP $@ - cmd_gzip = cat $(real-prereqs) | gzip -n -f -9 > $@ + cmd_gzip = cat $(real-prereqs) | $(_GZIP) -n -f -9 > $@ # DTC # --------------------------------------------------------------------------- @@ -322,19 +322,19 @@ printf "%08x\n" $$dec_size | \ ) quiet_cmd_bzip2 = BZIP2 $@ - cmd_bzip2 = { cat $(real-prereqs) | bzip2 -9; $(size_append); } > $@ + cmd_bzip2 = { cat $(real-prereqs) | $(_BZIP2) -9; $(size_append); } > $@ # Lzma # --------------------------------------------------------------------------- quiet_cmd_lzma = LZMA $@ - cmd_lzma = { cat $(real-prereqs) | lzma -9; $(size_append); } > $@ + cmd_lzma = { cat $(real-prereqs) | $(LZMA) -9; $(size_append); } > $@ quiet_cmd_lzo = LZO $@ - cmd_lzo = { cat $(real-prereqs) | lzop -9; $(size_append); } > $@ + cmd_lzo = { cat $(real-prereqs) | $(_LZOP) -9; $(size_append); } > $@ quiet_cmd_lz4 = LZ4 $@ - cmd_lz4 = { cat $(real-prereqs) | lz4c -l -c1 stdin stdout; \ + cmd_lz4 = { cat $(real-prereqs) | $(LZ4) -l -c1 stdin stdout; \ $(size_append); } > $@ # U-Boot mkimage @@ -381,7 +381,7 @@ quiet_cmd_xzkern = XZKERN $@ $(size_append); } > $@ quiet_cmd_xzmisc = XZMISC $@ - cmd_xzmisc = cat $(real-prereqs) | xz --check=crc32 --lzma2=dict=1MiB > $@ + cmd_xzmisc = cat $(real-prereqs) | $(XZ) --check=crc32 --lzma2=dict=1MiB > $@ # ASM offsets # --------------------------------------------------------------------------- diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 56eadcc48d46..4ea20e6b7e2b 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -45,7 +45,7 @@ if test "$(objtree)" != "$(srctree)"; then \ false; \ fi ; \ $(srctree)/scripts/setlocalversion --save-scmversion; \ -tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \ +tar -I $(_GZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \ --transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \ rm -f $(objtree)/.scmversion @@ -127,9 +127,9 @@ util/PERF-VERSION-GEN $(CURDIR)/$(perf-tar)/); \ tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \ rm -r $(perf-tar); \ $(if $(findstring tar-src,$@),, \ -$(if $(findstring bz2,$@),bzip2, \ -$(if $(findstring gz,$@),gzip, \ -$(if $(findstring xz,$@),xz, \ +$(if $(findstring bz2,$@),$(_BZIP2), \ +$(if $(findstring gz,$@),$(_GZIP), \ +$(if $(findstring xz,$@),$(XZ), \ $(error unknown target $@)))) \ -f -9 $(perf-tar).tar) diff --git a/scripts/package/buildtar b/scripts/package/buildtar index 2f66c81e4021..4ae3698cd84a 100755 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar @@ -28,15 +28,15 @@ case "${1}" in opts= ;; targz-pkg) - opts=--gzip + opts="-I ${_GZIP}" tarball=${tarball}.gz ;; tarbz2-pkg) - opts=--bzip2 + opts="-I ${_BZIP2}" tarball=${tarball}.bz2 ;; tarxz-pkg) - opts=--xz + opts="-I ${XZ}" tarball=${tarball}.xz ;; *) diff --git a/scripts/xz_wrap.sh b/scripts/xz_wrap.sh index 7a2d372f4885..76e9cbcfbeab 100755 --- a/scripts/xz_wrap.sh +++ b/scripts/xz_wrap.sh @@ -20,4 +20,4 @@ case $SRCARCH in sparc) BCJ=--sparc ;; esac -exec xz --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB +exec $XZ --check=crc32 $BCJ --lzma2=$LZMA2OPTS,dict=32MiB