From 6c88ec2e8b230dacca7b71ecc086b5148aaab959 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 27 Jun 2011 17:52:07 -0700
Subject: [PATCH 1/4] Revert "reversed logic"

This reverts commit 9e0869367084267855341758e23b4bf92907f5c3.
---
 mmcutils/mmcutils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmcutils/mmcutils.c b/mmcutils/mmcutils.c
index b1238ee..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) {
-#ifndef BOARD_HAS_SMALL_RECOVERY
+#ifdef BOARD_HAS_SMALL_RECOVERY
     char *const mke2fs[] = {MKE2FS_BIN, "-j", "-q", device, NULL};
     char *const tune2fs[] = {TUNE2FS_BIN, "-C", "1", device, NULL};
 #else

From 31c3ccf5318d123b43da5daecf4f4cadb5041320 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 27 Jun 2011 17:52:15 -0700
Subject: [PATCH 2/4] Revert "reversed logic"

This reverts commit 7305f7d956b08613659dcfb162ea60b495372556.
---
 utilities/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/Android.mk b/utilities/Android.mk
index 70ad908..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)
 
-ifneq ($(BOARD_HAS_SMALL_RECOVERY),true)
+ifeq ($(BOARD_HAS_SMALL_RECOVERY),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := mke2fs
 LOCAL_MODULE_TAGS := eng

From 47591ce0d0f87bf2a2e00c61c57d0cec2cea51f9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 27 Jun 2011 17:52:25 -0700
Subject: [PATCH 3/4] Revert "use BOARD_HAS_SMALL_RECOVERY instead of
 BOARD_HAS_LARGE_FILESYSTEM"

This reverts commit 5ab3281dbeec1fabaed6cce1cc142c26b44779f7.
---
 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 0b84efc..0046dc9 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_SMALL_RECOVERY),true)
-LOCAL_CFLAGS += -DBOARD_HAS_SMALL_RECOVERY
+ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
+LOCAL_CFLAGS += -DBOARD_HAS_LARGE_FILESYSTEM
 endif
 
 LOCAL_SRC_FILES := \
diff --git a/mmcutils/mmcutils.c b/mmcutils/mmcutils.c
index dbd2246..76b8ff8 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
+#ifdef BOARD_HAS_LARGE_FILESYSTEM
     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 899e4ea..79201a3 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)
+ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := mke2fs
 LOCAL_MODULE_TAGS := eng

From b4261d9ddd8b6e251d8e1bd5458b365cdd0b7ec7 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Mon, 27 Jun 2011 17:54:16 -0700
Subject: [PATCH 4/4] hopefully fix the logic. also address that the tune2fs
 and mke2fs binaries provided by codeaurora is arm v7, and thus can not be
 included for all devices.

Change-Id: I9ca996c904579fdb5df9a5453d2f1b9448f505db
---
 Android.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index cebd834..4d72ade 100644
--- a/Android.mk
+++ b/Android.mk
@@ -88,7 +88,10 @@ ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_SYMLINKS)
 # Now let's do recovery symlinks
 BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links)
 ifndef BOARD_HAS_SMALL_RECOVERY
-exclude := tune2fs mke2fs
+exclude := tune2fs
+ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
+exclude += mke2fs
+endif
 endif
 RECOVERY_BUSYBOX_SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
 $(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox