From patchwork Sat Jun 11 17:22:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12878610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15535C43334 for ; Sat, 11 Jun 2022 17:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238287AbiFKRXo (ORCPT ); Sat, 11 Jun 2022 13:23:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238181AbiFKRXn (ORCPT ); Sat, 11 Jun 2022 13:23:43 -0400 Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C317B3CFC9; Sat, 11 Jun 2022 10:23:37 -0700 (PDT) Received: from grover.sesame (133-32-177-133.west.xps.vectant.ne.jp [133.32.177.133]) (authenticated) by conuserg-09.nifty.com with ESMTP id 25BHMhjP022692; Sun, 12 Jun 2022 02:22:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 25BHMhjP022692 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1654968165; bh=MMlWHI79ZXLVfVOPspFzx7WO3YALeI7+en73nS8lFyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BPPzm9G0e6v8UIo5UGvWV0+CS09mXXIW3BFcw18fSZLEkOet4hu6efpdPrCVjuOWb I2CJb4QtmLSyESS+JDvVKxbDWuhE1Zbejlb6XpWGX0e/FGzVUU+RhEylEtIVu9hI9G Sux8kMsCqnJ+Z2lQHhnmBJjiBbaqwaRlYUH5SmP1mZv3stMcrG/bXRvNxNu9kmkJ4L VhE6vEpva8xUzxhrMLQZI+6qDiLomI4r1XkR5XTZo8rjakxevx3rBFskiMw+mf45o3 Njb+uypw1Pk1fqynv+6cNh1GqX7/AK0dvTB4zmiG1JUyiyn6x1i1BtvIdm+kcfIT55 3RaI0LCqLS0xw== X-Nifty-SrcIP: [133.32.177.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: =?unknown-8bit?q?David_Howells_=3Cdhowells=40redhat=2Ecom=3E=2C_Jarkko_S?= =?unknown-8bit?q?akkinen_=3Cjarkko=40kernel=2Eorg=3E=2C_Micka=8F=AB=B3l_Sal?= =?unknown-8bit?q?a=8F=AB=E4n___=3Cmic=40linux=2Emicrosoft=2Ecom=3E=2C_Masah?= =?unknown-8bit?q?iro_Yamada_=3Cmasahiroy=40kernel=2Eorg=3E=2C_David_Woodhou?= =?unknown-8bit?q?se_=3Cdwmw2=40infradead=2Eorg=3E=2C_keyrings=40vger=2Ekern?= =?unknown-8bit?q?el=2Eorg=2C_linux-kernel=40vger=2Ekernel=2Eorg?= Subject: [PATCH 3/4] certs: move scripts/check-blacklist-hashes.awk to certs/ Date: Sun, 12 Jun 2022 02:22:32 +0900 Message-Id: <20220611172233.1494073-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220611172233.1494073-1-masahiroy@kernel.org> References: <20220611172233.1494073-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org This script is only used in certs/Makefile, so certs/ is a better home for it. Signed-off-by: Masahiro Yamada Reviewed-by: Mickaël Salaün Reviewed-by: Jarkko Sakkinen --- MAINTAINERS | 1 - certs/Makefile | 2 +- {scripts => certs}/check-blacklist-hashes.awk | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename {scripts => certs}/check-blacklist-hashes.awk (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1fc9ead83d2a..7c2a7c304824 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4627,7 +4627,6 @@ L: keyrings@vger.kernel.org S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ -F: scripts/check-blacklist-hashes.awk F: scripts/sign-file.c F: tools/certs/ diff --git a/certs/Makefile b/certs/Makefile index a8d628fd5f7b..df7aaeafd19c 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -13,7 +13,7 @@ CFLAGS_blacklist_hashes.o := -I $(obj) quiet_cmd_check_and_copy_blacklist_hash_list = GEN $@ cmd_check_and_copy_blacklist_hash_list = \ - $(AWK) -f $(srctree)/scripts/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ + $(AWK) -f $(srctree)/$(src)/check-blacklist-hashes.awk $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) >&2; \ cat $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) > $@ $(obj)/blacklist_hash_list: $(CONFIG_SYSTEM_BLACKLIST_HASH_LIST) FORCE diff --git a/scripts/check-blacklist-hashes.awk b/certs/check-blacklist-hashes.awk similarity index 100% rename from scripts/check-blacklist-hashes.awk rename to certs/check-blacklist-hashes.awk