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