From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Mimi Zohar <zohar@linux.ibm.com>, linux-integrity@vger.kernel.org
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
linux-kernel@vger.kernel.org,
linux-security-module@vger.kernel.org
Subject: [PATCH 5/5] EVM: use obj-y for non-modular objects
Date: Fri, 26 Jul 2019 11:10:58 +0900 [thread overview]
Message-ID: <20190726021058.4212-6-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com>
CONFIG_EVM is a boolean option, so none of these objects is linked
into a module.
All the objects in this directory are compiled only when CONFIG_EVM=y
since this directory is guarded by the parent Makefile:
obj-$(CONFIG_EVM) += evm/
So, there is no point in creating the composite object, evm.o
Flatten the code into the obj-$(CONFIG_...) form.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
security/integrity/evm/Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/security/integrity/evm/Makefile b/security/integrity/evm/Makefile
index a56f5613be79..ace8e4ef5a96 100644
--- a/security/integrity/evm/Makefile
+++ b/security/integrity/evm/Makefile
@@ -2,7 +2,5 @@
#
# Makefile for building the Extended Verification Module(EVM)
#
-obj-$(CONFIG_EVM) += evm.o
-
-evm-y := evm_main.o evm_crypto.o evm_secfs.o
-evm-$(CONFIG_FS_POSIX_ACL) += evm_posix_acl.o
+obj-y := evm_main.o evm_crypto.o evm_secfs.o
+obj-$(CONFIG_FS_POSIX_ACL) += evm_posix_acl.o
--
2.17.1
prev parent reply other threads:[~2019-07-26 2:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 2:10 [PATCH 0/5] security: integrity: Makefile cleanups Masahiro Yamada
2019-07-26 2:10 ` [PATCH 1/5] integrity: remove unneeded, broken attempt to add -fshort-wchar Masahiro Yamada
2019-09-09 11:43 ` Masahiro Yamada
2019-07-26 2:10 ` [PATCH 2/5] integrity: remove pointless subdir-$(CONFIG_...) Masahiro Yamada
2019-09-09 11:44 ` Masahiro Yamada
2019-07-26 2:10 ` [PATCH 3/5] integrity: use obj-y for non-modular objects Masahiro Yamada
2019-07-26 2:10 ` [PATCH 4/5] IMA: " Masahiro Yamada
2019-07-26 4:37 ` Eric Biggers
2019-07-26 7:04 ` Masahiro Yamada
2019-07-26 2:10 ` Masahiro Yamada [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190726021058.4212-6-yamada.masahiro@socionext.com \
--to=yamada.masahiro@socionext.com \
--cc=jmorris@namei.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.