From 01daebbe68943725e7b80e30082330c6bd042a88 Mon Sep 17 00:00:00 2001
From: Tianjie Xu <xunchang@google.com>
Date: Thu, 8 Mar 2018 12:34:19 -0800
Subject: Set the update locations to default in CacheLocation's constructor

Otherwise the applypatch executable will fail to back up the source
file to /cache when patching the recovery image.

Bug: 74198354
Test: run applypatch from boot to recovery
(cherry picked from commit b4e3a370bf6fe2bbb6ad8e33d16ce3210595aaef)

Change-Id: I37b7fd88d66ab49ef953d4b7dca22577bd1472e1
---
 updater/updater.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'updater')

diff --git a/updater/updater.cpp b/updater/updater.cpp
index f063e5fa1..1d6b172bb 100644
--- a/updater/updater.cpp
+++ b/updater/updater.cpp
@@ -169,10 +169,6 @@ int main(int argc, char** argv) {
   }
   ota_io_init(za, state.is_retry);
 
-  // Initialize the cache_temp_source, last_command_file and stash_directory_base to their default
-  // locations.
-  CacheLocation::location().ResetLocations();
-
   std::string result;
   bool status = Evaluate(&state, root, &result);
 
-- 
cgit v1.2.3


From 1224544806382ca98bbb7d9edba83b0c2e1be21f Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Wed, 4 Apr 2018 21:14:01 -0700
Subject: install: mkfs.f2fs: specify sector size for target image size

The total sectors that we want to format is used in different meanings from
various users. This notifies its size based on 512 bytes explicitly.

Bug: 76407663
Change-Id: I20687b40a1733d3b459a45f8b64a338c37a7bc95
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
 updater/install.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'updater')

diff --git a/updater/install.cpp b/updater/install.cpp
index 2b6c20fe3..6732ab897 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -548,6 +548,8 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
                                 "encrypt",
                                 "-O",
                                 "quota",
+                                "-w",
+                                "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };
-- 
cgit v1.2.3


From 2e5dc84d51728644436dfbbacbed054f10e923f5 Mon Sep 17 00:00:00 2001
From: Jaegeuk Kim <jaegeuk@google.com>
Date: Thu, 5 Apr 2018 22:42:13 -0700
Subject: recovery: enable fsverity feature bit

Bug: 74604441
Bug 67380979
Change-Id: Iab1cc9aef356f0ddf6e2491578a2bd53009182ce
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
---
 updater/install.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'updater')

diff --git a/updater/install.cpp b/updater/install.cpp
index 6732ab897..9be7645f3 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -544,12 +544,10 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
     const char* f2fs_argv[] = { "mkfs.f2fs",
                                 "-d1",
                                 "-f",
-                                "-O",
-                                "encrypt",
-                                "-O",
-                                "quota",
-                                "-w",
-                                "512",
+                                "-O", "encrypt",
+                                "-O", "quota",
+                                "-O", "verity",
+                                "-w", "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };
-- 
cgit v1.2.3