diff options
| author | Alistair Strachan <astrachan@google.com> | 2018-07-27 09:18:28 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-08-30 16:16:14 +0530 |
| commit | d0498ed8b3975d228630fc0f51ed7bdf8bc24688 (patch) | |
| tree | 3d4ea52dc05269c3c36e556635abf68a77cb167e | |
| parent | 6e031bd79fd0e3e8244821cc69004031390b231f (diff) | |
| download | linaro-android-d0498ed8b3975d228630fc0f51ed7bdf8bc24688.tar.gz | |
ANDROID: verity: really fix android-verity Kconfig
The change "ANDROID: verity: fix android-verity Kconfig dependencies"
relaxed the dependency on DM_VERITY=y to just DM_VERITY, but this is not
correct because there are parts of the verity and dm-mod API that
android-verity is using but which are not exported to modules.
Work around this problem by disallowing android-verity to be built-in
when the dm/verity core is built modularly.
Bug: 72722987
Change-Id: I3cfaa2acca8e4a4b5c459afdddd958ac9f8c1eb3
Signed-off-by: Alistair Strachan <astrachan@google.com>
| -rw-r--r-- | drivers/md/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig index 49ea175c6d38..be6b64ce3881 100644 --- a/drivers/md/Kconfig +++ b/drivers/md/Kconfig @@ -576,8 +576,8 @@ config DM_ZONED config DM_ANDROID_VERITY bool "Android verity target support" - depends on BLK_DEV_DM - depends on DM_VERITY + depends on BLK_DEV_DM=y + depends on DM_VERITY=y depends on X509_CERTIFICATE_PARSER depends on SYSTEM_TRUSTED_KEYRING depends on CRYPTO_RSA |