From b5acadc7aa81fb73053404d7d57536be58e05da9 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 20 Dec 2022 22:42:00 +0200 Subject: [PATCH] Add e2fsck/resize2fs/tune2fs to recovery/vendor_ramdisk Fixes: [ERROR]: recovery: [libfs_mgr]Unable to enable ext4 verity on /dev/block/by-name/metadata because /system/bin/tune2fs is missing in recovery. Test: e2fsck/resize2fs/tune2fs are present in ramdisks. Change-Id: I83223f48e4df8b89ff9b27b0912174360c053617 Signed-off-by: RITEFANG <1721985272@qq.com> --- target/product/virtual_ab_ota/launch.mk | 11 ++++++++++- .../virtual_ab_ota/launch_with_vendor_ramdisk.mk | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/target/product/virtual_ab_ota/launch.mk b/target/product/virtual_ab_ota/launch.mk index e4c45758ba..9241a17875 100644 --- a/target/product/virtual_ab_ota/launch.mk +++ b/target/product/virtual_ab_ota/launch.mk @@ -18,4 +18,13 @@ PRODUCT_VIRTUAL_AB_OTA := true PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.enabled=true -PRODUCT_PACKAGES += e2fsck_ramdisk +PRODUCT_PACKAGES += \ + e2fsck_ramdisk \ + resize2fs_ramdisk \ + tune2fs_ramdisk + +# For dedicated recovery partitions, we need to include fs tools +PRODUCT_PACKAGES += \ + e2fsck.recovery \ + resize2fs.recovery \ + tune2fs.recovery diff --git a/target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk b/target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk index de1f07d8cb..b79340e06b 100644 --- a/target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk +++ b/target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk @@ -25,3 +25,5 @@ PRODUCT_PACKAGES += \ linker.vendor_ramdisk \ e2fsck.vendor_ramdisk \ fsck.f2fs.vendor_ramdisk \ + resize2fs.vendor_ramdisk \ + tune2fs.vendor_ramdisk