From patchwork Fri Jul 26 02:10:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169772 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370521ilk; Thu, 25 Jul 2019 19:11:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqw9PuJSUaRyeDWrTCdK5OkhMAUhjwx9wk/0/8AiabM/ev9joDe+tDQXq6oBd/L2dl4EnSJb X-Received: by 2002:a62:5c3:: with SMTP id 186mr19663841pff.144.1564107109783; Thu, 25 Jul 2019 19:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107109; cv=none; d=google.com; s=arc-20160816; b=P+/hJWyqE4jgL8dIpgJVKXu/lFWM4MzyFurGFzHYkjTZynDYI/FbbLXFr9+PNun0Xk lStOl9X/0eC15WxF1treWlRle8/ghnbZnfnS5UfyV/MwcKQSVpvM7B8tV3rJll91MtHc x/Zg/9QAgdVLdOr43XnbQO7taOlQL5vRuOtCsWxATIwBV+fpjNu5Cl/uC5Bd/0BAE3yG FyLwogLqcc4z5g2NMII7E4yCdizvuc7ApZalJvjgbyOHxWDh79GtDA5geNoys2H5XPnM skq0zGfPn34ZyBS0UgZ+tAbpNb72jNEpzsP/udtZN3vech43TNGNVH4UV0cchx9ZHIRq jgpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=d0XIimaYVsZuor/Vqvat3vZ1jPTCJjSdyV2UnY7OLcQ=; b=kjK0lX23mBX/N/VlXvQNkzXGnZdyfgLo2NiY712sX+yNcadmDONu0gQ7mQX7SXNZ7T /kZ40xqsCSdna44UTQLik8pCW3TFEFw9NjANkOT/Idm19jgdZzUOtmmwA7GasGKqu/DJ CdfYiT93Jp2GaQc/Hnn1bo8za6rEYiTh+tVgRHB7lqdFGc4hCfVHMuDJu5b4NxyOyh8x rjDwSYYRddEBsja9PAnR+6CEQsF+cJX5IEWprN9eo1wDlgZc6lxrv9SuXmQA4b6LcdFe phEZTeNnf2wlKwht7ReWdps5LZf8PHyw+Fv46Kskp73Y42GJXi57yqpwvTggLsoVIGUs +jNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=wbo3cxpR; 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 ci5si19257391plb.45.2019.07.25.19.11.49; Thu, 25 Jul 2019 19:11:49 -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=@nifty.com header.s=dec2015msa header.b=wbo3cxpR; 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 S1726195AbfGZCLs (ORCPT + 29 others); Thu, 25 Jul 2019 22:11:48 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63665 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726023AbfGZCLp (ORCPT ); Thu, 25 Jul 2019 22:11:45 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03l020523; Fri, 26 Jul 2019 11:11:03 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03l020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107064; bh=d0XIimaYVsZuor/Vqvat3vZ1jPTCJjSdyV2UnY7OLcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wbo3cxpRfJwWVXDE26VHPcZJzvkvNPmdtSZzhaCH/OleeiJo9oSsmQa4nM+LrBxZg jKlgx8BYKcXVSFGrXxyFiG54oKueKUWsFi738OIOmdKo9xua1720j1j7tGlCzXs1hn es9RTXA6gHvxt8YcxXZKtrWV9eEkZuDloj5BsGn5lhFm+kbi0X6kPuj4/9WBIp/S1e Vxe5njb7eGHy+fY+Dg3j0Q0hZILr5jBVah8cU3o4QgRnNhBinAii83DCHbsdEK3+XH Esj0rHgLwTKeY5QU8xV/ltusQxMn6dDjYstdEVeNlljsWUh/O0I7a2+hUuGyWVhGM2 ANCgN1FC3r1lQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , Dave Howells , James Morris , Josh Boyer , Martin Schwidefsky , Nayna Jain , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 3/5] integrity: use obj-y for non-modular objects Date: Fri, 26 Jul 2019 11:10:56 +0900 Message-Id: <20190726021058.4212-4-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com> References: <20190726021058.4212-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_INTEGRITY is a boolean option, so none of these objects is linked into a module. All of the other CONFIG options here depend on CONFIG_INTEGRITY, so there is no point in creating the composite object, integirity.o Flatten the code into the obj-$(CONFIG_...) form. Signed-off-by: Masahiro Yamada --- security/integrity/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/security/integrity/Makefile b/security/integrity/Makefile index 35e6ca773734..53bb1d70e631 100644 --- a/security/integrity/Makefile +++ b/security/integrity/Makefile @@ -3,16 +3,14 @@ # Makefile for caching inode integrity data (iint) # -obj-$(CONFIG_INTEGRITY) += integrity.o - -integrity-y := iint.o -integrity-$(CONFIG_INTEGRITY_AUDIT) += integrity_audit.o -integrity-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o -integrity-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o -integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o -integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ +obj-$(CONFIG_INTEGRITY) += iint.o +obj-$(CONFIG_INTEGRITY_AUDIT) += integrity_audit.o +obj-$(CONFIG_INTEGRITY_SIGNATURE) += digsig.o +obj-$(CONFIG_INTEGRITY_ASYMMETRIC_KEYS) += digsig_asymmetric.o +obj-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyring.o +obj-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ platform_certs/load_uefi.o -integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o +obj-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o obj-$(CONFIG_IMA) += ima/ obj-$(CONFIG_EVM) += evm/