From a87bb5f57b5f81557def8bb931e8e503840422ef Mon Sep 17 00:00:00 2001 From: Donovan Bartish Date: Thu, 29 Sep 2011 15:37:19 -0500 Subject: [PATCH 1/2] edited nandroid.c to include rfs in fs lists Change-Id: I403331df04d6a4cf75fd898af42dec7aab5a1b59 --- nandroid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nandroid.c b/nandroid.c index 30190fa..ffc5ac0 100644 --- a/nandroid.c +++ b/nandroid.c @@ -387,7 +387,7 @@ int nandroid_restore_partition_extended(const char* backup_path, const char* mou char* name = basename(mount_point); nandroid_restore_handler restore_handler = NULL; - const char *filesystems[] = { "yaffs2", "ext2", "ext3", "ext4", "vfat", NULL }; + const char *filesystems[] = { "yaffs2", "ext2", "ext3", "ext4", "vfat", "rfs", NULL }; const char* backup_filesystem = NULL; Volume *vol = volume_for_path(mount_point); const char *device = NULL; From 2e85422f89830054b31bb0194c39d037f033993a Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 4 Oct 2011 16:33:30 -0700 Subject: [PATCH 2/2] juggle around some of the ext handling tools. add setprop link Change-Id: Ic091d682d42d14d4942e481a6099e04bb8d7ac21 --- Android.mk | 4 ++-- utilities/Android.mk | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Android.mk b/Android.mk index b4c8f4f..e01f71d 100644 --- a/Android.mk +++ b/Android.mk @@ -37,7 +37,7 @@ else RECOVERY_NAME := CWM-based Recovery endif -RECOVERY_VERSION := $(RECOVERY_NAME) v5.0.2.3 +RECOVERY_VERSION := $(RECOVERY_NAME) v5.0.2.6 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 @@ -84,7 +84,7 @@ LOCAL_C_INCLUDES += system/extras/ext4_utils include $(BUILD_EXECUTABLE) -RECOVERY_LINKS := edify busybox flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot volume +RECOVERY_LINKS := edify busybox flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot volume setprop # nc is provided by external/netcat RECOVERY_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(RECOVERY_LINKS)) diff --git a/utilities/Android.mk b/utilities/Android.mk index fb2e098..582c9d6 100755 --- a/utilities/Android.mk +++ b/utilities/Android.mk @@ -2,13 +2,6 @@ LOCAL_PATH := $(call my-dir) ifndef BOARD_HAS_SMALL_RECOVERY -include $(CLEAR_VARS) -LOCAL_MODULE := e2fsck -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -LOCAL_SRC_FILES := $(LOCAL_MODULE) -include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := fix_permissions @@ -34,6 +27,17 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) +endif + +include $(CLEAR_VARS) +LOCAL_MODULE := e2fsck +LOCAL_MODULE_TAGS := eng +LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES +LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin +LOCAL_SRC_FILES := $(LOCAL_MODULE) +include $(BUILD_PREBUILT) + + include $(CLEAR_VARS) LOCAL_MODULE := tune2fs LOCAL_MODULE_TAGS := eng @@ -54,7 +58,6 @@ else LOCAL_SRC_FILES := ../../../$(BOARD_MKE2FS) endif include $(BUILD_PREBUILT) -endif ifeq ($(BOARD_USES_RECOVERY_CHARGEMODE),true) include $(CLEAR_VARS)