Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 96857c4c authored by Alistair Delva's avatar Alistair Delva Committed by Alexander Grund
Browse files

ANDROID: cuttlefish_defconfig: Fix dm-verity related options 

Use the suggestions mentioned in the APEX documentation
https://source.android.com/devices/tech/ota/apex



Also, enable DM_VERITY_AVB on x86, which was incorrectly disabled.

Change-Id: Id9e1b0bf525802dd67a9bf4b7c6c6408e87948fd
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
parent 6989b38c

arch/arm64/configs/cuttlefish_defconfig

+10 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ CONFIG_DEBUG_DEVRES=y 
CONFIG_OF_UNITTEST=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_LOOP_MIN_COUNT=16

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_VIRTIO_BLK=y
@@ -195,12 +196,15 @@ CONFIG_SCSI=y 
CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_VIRTIO=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

CONFIG_MD_LINEAR=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y

CONFIG_DM_VERITY_AVB=y

CONFIG_DM_ANDROID_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y

CONFIG_NETCONSOLE_DYNAMIC=y
@@ -409,7 +413,13 @@ CONFIG_SECURITY_NETWORK=y 
CONFIG_LSM_MMAP_MIN_ADDR=65536

CONFIG_HARDENED_USERCOPY=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_RSA=y

CONFIG_CRYPTO_SHA512=y

CONFIG_CRYPTO_LZ4=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y

CONFIG_X509_CERTIFICATE_PARSER=y

CONFIG_SYSTEM_TRUSTED_KEYRING=y

CONFIG_SYSTEM_TRUSTED_KEYS="verity_dev_keys.x509"

CONFIG_XZ_DEC=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ CONFIG_OF_UNITTEST=y 
# CONFIG_PNP_DEBUG_MESSAGES is not set

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_LOOP_MIN_COUNT=16

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_VIRTIO_BLK=y
@@ -228,6 +229,7 @@ CONFIG_DM_ZERO=y 
CONFIG_DM_UEVENT=y

CONFIG_DM_VERITY=y

CONFIG_DM_VERITY_FEC=y

CONFIG_DM_VERITY_AVB=y

CONFIG_DM_ANDROID_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_NETCONSOLE=y