From 7f4ff5cd3a7c41be8a40b144afb0d842905cf945 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 20 Sep 2010 19:21:52 -0700 Subject: [PATCH 1/2] favor primary device always for fstab --- Android.mk | 2 +- extendedcommands.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Android.mk b/Android.mk index c1447af..0c2d349 100644 --- a/Android.mk +++ b/Android.mk @@ -44,7 +44,7 @@ LOCAL_MODULE := recovery LOCAL_FORCE_STATIC_EXECUTABLE := true -RECOVERY_VERSION := ClockworkMod Recovery v2.5.0.9 +RECOVERY_VERSION := ClockworkMod Recovery v2.5.1.0 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) diff --git a/extendedcommands.c b/extendedcommands.c index 739529c..f2be700 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -924,14 +924,7 @@ void write_fstab_root(char *root_path, FILE *file) } else { - // only SDCARD: seems to be using device2. - // and mmcblkXp1 is the fallback/device2. - // However, generally, mmcblkXp1 is usually where the - // FAT partition is located... so favor that. - if (NULL == info->device2) - fprintf(file, "%s ", info->device); - else - fprintf(file, "%s ", info->device2); + fprintf(file, "%s ", info->device); } fprintf(file, "%s ", info->mount_point); From adf906d034480fdffbfca51f56176d0e0d603437 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 26 Sep 2010 15:58:35 -0700 Subject: [PATCH 2/2] custom keymapping support --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 0c2d349..ab25729 100644 --- a/Android.mk +++ b/Android.mk @@ -137,10 +137,10 @@ endif LOCAL_MODULE_TAGS := eng LOCAL_STATIC_LIBRARIES := -ifeq ($(TARGET_RECOVERY_UI_LIB),) +ifeq ($(BOARD_CUSTOM_RECOVERY_KEYMAPPING),) LOCAL_SRC_FILES += default_recovery_ui.c else - LOCAL_STATIC_LIBRARIES += $(TARGET_RECOVERY_UI_LIB) + LOCAL_SRC_FILES += $(BOARD_CUSTOM_RECOVERY_KEYMAPPING) endif LOCAL_STATIC_LIBRARIES += libbusybox libclearsilverregex libmkyaffs2image libunyaffs liberase_image libdump_image libflash_image libmtdutils LOCAL_STATIC_LIBRARIES += libamend