From 77b07ae00a30ef8fa9de8bb04214a42ca9339a90 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Wed, 27 Nov 2019 13:53:28 +0000
Subject: [PATCH] verity: enable CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG

New option in 5.4, allows dm-verity volumes to be optionally verified
by pkcs7 signatures.
---
 debian/changelog     | 3 +++
 debian/config/config | 1 +
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 802f55eb38e0..f9167ce244d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -132,6 +132,9 @@ linux (5.4.2-1~exp1) UNRELEASED; urgency=medium
   [ Aurelien Jarno]
   * [ppc64el] Fix building libbpf with recent binutils versions (fixes FTBFS).
 
+  [ Luca Boccassi ]
+  * verity: enable CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG
+
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 28 Nov 2019 03:55:10 +0000
 
 linux (5.4-1~exp1) experimental; urgency=medium
diff --git a/debian/config/config b/debian/config/config
index f8a7a068bf62..8cc0b3e0fe9a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1913,6 +1913,7 @@ CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 # CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m