From aee5f85b296f1dec0546c0778605de68e5a25d1e Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 27 Jun 2011 11:02:44 -0700 Subject: [PATCH 1/5] fix up libreboot dependency to librebootrecovery Change-Id: If39697943554538c938edaa478976eed9feb82d7 --- Android.mk | 2 +- libcrecovery/common.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 34c092d..5af29dc 100644 --- a/Android.mk +++ b/Android.mk @@ -53,7 +53,7 @@ else LOCAL_SRC_FILES += $(BOARD_CUSTOM_RECOVERY_KEYMAPPING) endif -LOCAL_STATIC_LIBRARIES += libreboot +LOCAL_STATIC_LIBRARIES += librebootrecovery LOCAL_STATIC_LIBRARIES += libext4_utils libz LOCAL_STATIC_LIBRARIES += libminzip libunz libmincrypt diff --git a/libcrecovery/common.h b/libcrecovery/common.h index bf83dd2..59af22e 100644 --- a/libcrecovery/common.h +++ b/libcrecovery/common.h @@ -1,6 +1,8 @@ #ifndef LIBCRECOVERY_COMMON_H #define LIBCRECOVERY_COMMON_H +#include + int __system(const char *command); FILE * __popen(const char *program, const char *type); int __pclose(FILE *iop); From b986fe24b45cdcd01bbef787dfea94a911619b24 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 27 Jun 2011 11:03:04 -0700 Subject: [PATCH 2/5] Revert "Reverts: http://review.cyanogenmod.com/#change,6130" This reverts commit a42d2b1e2466f69be6d802cd6511c076e0285ad9. --- Android.mk | 2 +- extendedcommands.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Android.mk b/Android.mk index 5af29dc..cebd834 100644 --- a/Android.mk +++ b/Android.mk @@ -31,7 +31,7 @@ LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) -BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE TARGET_RECOVERY_PRE_COMMAND +BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_LDPI_RECOVERY BOARD_UMS_LUNFILE $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \ $(if $($(board_define)), \ diff --git a/extendedcommands.c b/extendedcommands.c index 6725bef..c2a0e18 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -894,10 +894,7 @@ void show_advanced_menu() switch (chosen_item) { case 0: -#ifdef TARGET_RECOVERY_PRE_COMMAND - __system(TARGET_RECOVERY_PRE_COMMAND); -#endif - __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART2, "recovery"); + reboot_wrapper("recovery"); break; case 1: { From 5ab3281dbeec1fabaed6cce1cc142c26b44779f7 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 27 Jun 2011 11:06:10 -0700 Subject: [PATCH 3/5] use BOARD_HAS_SMALL_RECOVERY instead of BOARD_HAS_LARGE_FILESYSTEM Change-Id: I7fe8bf226bdcf6429df62ae7fee82b5dabe6725b --- mmcutils/Android.mk | 4 ++-- mmcutils/mmcutils.c | 2 +- utilities/Android.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mmcutils/Android.mk b/mmcutils/Android.mk index 0046dc9..0b84efc 100644 --- a/mmcutils/Android.mk +++ b/mmcutils/Android.mk @@ -4,8 +4,8 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true) -LOCAL_CFLAGS += -DBOARD_HAS_LARGE_FILESYSTEM +ifeq ($(BOARD_HAS_SMALL_RECOVERY),true) +LOCAL_CFLAGS += -DBOARD_HAS_SMALL_RECOVERY endif LOCAL_SRC_FILES := \ diff --git a/mmcutils/mmcutils.c b/mmcutils/mmcutils.c index 76b8ff8..dbd2246 100644 --- a/mmcutils/mmcutils.c +++ b/mmcutils/mmcutils.c @@ -340,7 +340,7 @@ run_exec_process ( char **argv) { int format_ext3_device (const char *device) { -#ifdef BOARD_HAS_LARGE_FILESYSTEM +#ifdef BOARD_HAS_SMALL_RECOVERY char *const mke2fs[] = {MKE2FS_BIN, "-j", "-q", device, NULL}; char *const tune2fs[] = {TUNE2FS_BIN, "-C", "1", device, NULL}; #else diff --git a/utilities/Android.mk b/utilities/Android.mk index 79201a3..899e4ea 100755 --- a/utilities/Android.mk +++ b/utilities/Android.mk @@ -42,7 +42,7 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) -ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true) +ifeq ($(BOARD_HAS_SMALL_RECOVERY),true) include $(CLEAR_VARS) LOCAL_MODULE := mke2fs LOCAL_MODULE_TAGS := eng From 7305f7d956b08613659dcfb162ea60b495372556 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 27 Jun 2011 11:29:55 -0700 Subject: [PATCH 4/5] reversed logic Change-Id: I8fb671556b6fdfac9b34d48106cb3365c80bbe5a --- utilities/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/Android.mk b/utilities/Android.mk index 899e4ea..70ad908 100755 --- a/utilities/Android.mk +++ b/utilities/Android.mk @@ -42,7 +42,7 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) -ifeq ($(BOARD_HAS_SMALL_RECOVERY),true) +ifneq ($(BOARD_HAS_SMALL_RECOVERY),true) include $(CLEAR_VARS) LOCAL_MODULE := mke2fs LOCAL_MODULE_TAGS := eng From 9e0869367084267855341758e23b4bf92907f5c3 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Mon, 27 Jun 2011 11:30:31 -0700 Subject: [PATCH 5/5] reversed logic Change-Id: Ie29418d7e3d82345f82888ade3eabdf6af5865f6 --- mmcutils/mmcutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmcutils/mmcutils.c b/mmcutils/mmcutils.c index dbd2246..b1238ee 100644 --- a/mmcutils/mmcutils.c +++ b/mmcutils/mmcutils.c @@ -340,7 +340,7 @@ run_exec_process ( char **argv) { int format_ext3_device (const char *device) { -#ifdef BOARD_HAS_SMALL_RECOVERY +#ifndef BOARD_HAS_SMALL_RECOVERY char *const mke2fs[] = {MKE2FS_BIN, "-j", "-q", device, NULL}; char *const tune2fs[] = {TUNE2FS_BIN, "-C", "1", device, NULL}; #else