From c1c7311b8ada7fce948afaabe91d72f4a7c0cb68 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Tue, 28 Nov 2017 19:48:05 -0800 Subject: [PATCH 1/3] add sload.f2fs for recovery format Change-Id: Iddfe54b2b36f2d531925cbe61c98dbfb4903c0d1 Signed-off-by: Jaegeuk Kim --- Android.mk | 2 +- roots.cpp | 19 +++++++++++++------ updater/install.cpp | 9 +++++++++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Android.mk b/Android.mk index d9966b7c..2f57db34 100644 --- a/Android.mk +++ b/Android.mk @@ -89,7 +89,7 @@ LOCAL_REQUIRED_MODULES := e2fsdroid_static mke2fs_static mke2fs.conf ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) ifeq ($(HOST_OS),linux) -LOCAL_REQUIRED_MODULES += mkfs.f2fs +LOCAL_REQUIRED_MODULES += sload.f2fs mkfs.f2fs endif endif diff --git a/roots.cpp b/roots.cpp index eb299ad6..e2d5d654 100644 --- a/roots.cpp +++ b/roots.cpp @@ -324,16 +324,23 @@ int format_volume(const char* volume, const char* directory) { } // Has to be f2fs because we checked earlier. - std::vector f2fs_args = { "/sbin/mkfs.f2fs", "-d1", "-f", - "-O", "encrypt", "-O", "quota", - v->blk_device }; + std::string cmd("/sbin/mkfs.f2fs"); + std::vector make_f2fs_cmd = { cmd, "-d1", "-f", "-O", + "encrypt", "-O", "quota", v->blk_device }; if (length >= 512) { - f2fs_args.push_back(std::to_string(length / 512)); + make_f2fs_cmd.push_back(std::to_string(length / 512)); } - int result = exec_cmd(f2fs_args); + int result = exec_cmd(make_f2fs_cmd); + if (result == 0 && directory != nullptr) { + cmd = "/sbin/sload.f2fs"; + std::vector sload_f2fs_cmd = { + cmd, "-f", directory, "-t", volume, v->blk_device, + }; + result = exec_cmd(sload_f2fs_cmd); + } if (result != 0) { - PLOG(ERROR) << "format_volume: Failed to make f2fs on " << v->blk_device; + PLOG(ERROR) << "format_volume: Failed " << cmd << " on " << v->blk_device; return -1; } return 0; diff --git a/updater/install.cpp b/updater/install.cpp index 870b8579..b83d30ff 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -318,6 +318,15 @@ Value* FormatFn(const char* name, State* state, const std::vector(sload_argv)); + if (status != 0) { + LOG(ERROR) << name << ": sload.f2fs failed (" << status << ") on " << location; + return StringValue(""); + } + return StringValue(location); } else { LOG(ERROR) << name << ": unsupported fs_type \"" << fs_type << "\" partition_type \"" From 4dca6f12dbbf76917c03514f8b7123a4ec927984 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 6 Dec 2017 08:41:50 -0800 Subject: [PATCH 2/3] Add a /bin symlink for consistency. Bug: http://b/63142920 Test: builds Change-Id: I1f96935daca4d79f753e172067e07f8e27ea819e --- etc/init.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/init.rc b/etc/init.rc index d8121cc4..0fc6c4c1 100644 --- a/etc/init.rc +++ b/etc/init.rc @@ -11,6 +11,7 @@ on init export ANDROID_DATA /data export EXTERNAL_STORAGE /sdcard + symlink /system/bin /bin symlink /system/etc /etc mount cgroup none /acct cpuacct From 47e5a8d08569a456981854a194d6dc66b8d85265 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 1 Dec 2017 10:53:34 -0800 Subject: [PATCH 3/3] applypatch: Remove the 'st' field from FileContents. It used to keep track of the stat(2) info (e.g. st_mode/st_gid/st_uid) while patching a file in file-based OTA. Test: Build and use the new updater to apply an update on bullhead. Change-Id: Ibf8f0f4b14298a9489bf24a2678bb279c5d9c8f3 --- applypatch/applypatch.cpp | 18 +++--------------- applypatch/include/applypatch/applypatch.h | 2 -- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 41a72eb1..04b964b1 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -58,12 +58,13 @@ int LoadFileContents(const char* filename, FileContents* file) { return LoadPartitionContents(filename, file); } - if (stat(filename, &file->st) == -1) { + struct stat sb; + if (stat(filename, &sb) == -1) { printf("failed to stat \"%s\": %s\n", filename, strerror(errno)); return -1; } - std::vector data(file->st.st_size); + std::vector data(sb.st_size); unique_file f(ota_fopen(filename, "rb")); if (!f) { printf("failed to open \"%s\": %s\n", filename, strerror(errno)); @@ -180,10 +181,6 @@ static int LoadPartitionContents(const std::string& filename, FileContents* file buffer.resize(buffer_size); file->data = std::move(buffer); - // Fake some stat() info. - file->st.st_mode = 0644; - file->st.st_uid = 0; - file->st.st_gid = 0; return 0; } @@ -212,15 +209,6 @@ int SaveFileContents(const char* filename, const FileContents* file) { return -1; } - if (chmod(filename, file->st.st_mode) != 0) { - printf("chmod of \"%s\" failed: %s\n", filename, strerror(errno)); - return -1; - } - if (chown(filename, file->st.st_uid, file->st.st_gid) != 0) { - printf("chown of \"%s\" failed: %s\n", filename, strerror(errno)); - return -1; - } - return 0; } diff --git a/applypatch/include/applypatch/applypatch.h b/applypatch/include/applypatch/applypatch.h index 6d7ffd78..c8ad9150 100644 --- a/applypatch/include/applypatch/applypatch.h +++ b/applypatch/include/applypatch/applypatch.h @@ -18,7 +18,6 @@ #define _APPLYPATCH_H #include -#include #include #include @@ -33,7 +32,6 @@ struct Value; struct FileContents { uint8_t sha1[SHA_DIGEST_LENGTH]; std::vector data; - struct stat st; }; // When there isn't enough room on the target filesystem to hold the patched version of the file,