Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
use source built e2fsprogs! thanks cvpcs!
Change-Id: Id3067d4da53643ae1af0b9f15445262afda7b197
  • Loading branch information
koush committed Jan 31, 2012
1 parent e2a6658 commit a465962
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 51 deletions.
9 changes: 2 additions & 7 deletions Android.mk
Expand Up @@ -49,7 +49,7 @@ else
endif endif
LOCAL_CFLAGS += -DBOARD_RECOVERY_CHAR_WIDTH=$(BOARD_RECOVERY_CHAR_WIDTH) -DBOARD_RECOVERY_CHAR_HEIGHT=$(BOARD_RECOVERY_CHAR_HEIGHT) LOCAL_CFLAGS += -DBOARD_RECOVERY_CHAR_WIDTH=$(BOARD_RECOVERY_CHAR_WIDTH) -DBOARD_RECOVERY_CHAR_HEIGHT=$(BOARD_RECOVERY_CHAR_HEIGHT)


BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_HAS_SMALL_RECOVERY BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT BOARD_RECOVERY_DEFINES := BOARD_HAS_NO_SELECT_BUTTON BOARD_UMS_LUNFILE BOARD_RECOVERY_ALWAYS_WIPES BOARD_RECOVERY_HANDLES_MOUNT BOARD_TOUCH_RECOVERY


$(foreach board_define,$(BOARD_RECOVERY_DEFINES), \ $(foreach board_define,$(BOARD_RECOVERY_DEFINES), \
$(if $($(board_define)), \ $(if $($(board_define)), \
Expand Down Expand Up @@ -109,12 +109,7 @@ ALL_DEFAULT_INSTALLED_MODULES += $(RECOVERY_SYMLINKS)


# Now let's do recovery symlinks # Now let's do recovery symlinks
BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links) 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 := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
$(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox $(RECOVERY_BUSYBOX_SYMLINKS): BUSYBOX_BINARY := busybox
$(RECOVERY_BUSYBOX_SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(RECOVERY_BUSYBOX_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
Expand Down
2 changes: 0 additions & 2 deletions extendedcommands.c
Expand Up @@ -912,12 +912,10 @@ void show_advanced_menu()
"Report Error", "Report Error",
"Key Test", "Key Test",
"Show log", "Show log",
#ifndef BOARD_HAS_SMALL_RECOVERY
"Partition SD Card", "Partition SD Card",
"Fix Permissions", "Fix Permissions",
#ifdef BOARD_HAS_SDCARD_INTERNAL #ifdef BOARD_HAS_SDCARD_INTERNAL
"Partition Internal SD Card", "Partition Internal SD Card",
#endif
#endif #endif
NULL NULL
}; };
Expand Down
4 changes: 0 additions & 4 deletions mmcutils/Android.mk
Expand Up @@ -4,10 +4,6 @@ ifeq ($(TARGET_ARCH),arm)
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)


ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true)
LOCAL_CFLAGS += -DBOARD_HAS_LARGE_FILESYSTEM
endif

LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
mmcutils.c mmcutils.c


Expand Down
5 changes: 0 additions & 5 deletions mmcutils/mmcutils.c
Expand Up @@ -340,13 +340,8 @@ run_exec_process ( char **argv) {


int int
format_ext3_device (const char *device) { format_ext3_device (const char *device) {
#ifdef BOARD_HAS_LARGE_FILESYSTEM
char *const mke2fs[] = {MKE2FS_BIN, "-j", "-q", device, NULL}; char *const mke2fs[] = {MKE2FS_BIN, "-j", "-q", device, NULL};
char *const tune2fs[] = {TUNE2FS_BIN, "-C", "1", device, NULL}; char *const tune2fs[] = {TUNE2FS_BIN, "-C", "1", device, NULL};
#else
char *const mke2fs[] = {MKE2FS_BIN, "-j", device, NULL};
char *const tune2fs[] = {TUNE2FS_BIN, "-j", "-C", "1", device, NULL};
#endif
// Run mke2fs // Run mke2fs
if(run_exec_process(mke2fs)) { if(run_exec_process(mke2fs)) {
printf("failure while running mke2fs\n"); printf("failure while running mke2fs\n");
Expand Down
58 changes: 25 additions & 33 deletions utilities/Android.mk
@@ -1,8 +1,5 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)


ifndef BOARD_HAS_SMALL_RECOVERY


include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := fix_permissions LOCAL_MODULE := fix_permissions
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
Expand All @@ -27,38 +24,33 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT) include $(BUILD_PREBUILT)


endif # include $(CLEAR_VARS)
# LOCAL_MODULE := e2fsck
# LOCAL_MODULE_TAGS := optional
# LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
# LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
# LOCAL_SRC_FILES := $(LOCAL_MODULE)
# include $(BUILD_PREBUILT)


include $(CLEAR_VARS) # include $(CLEAR_VARS)
LOCAL_MODULE := e2fsck # LOCAL_MODULE := tune2fs
LOCAL_MODULE_TAGS := optional # LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES # LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin # LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
LOCAL_SRC_FILES := $(LOCAL_MODULE) # LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT) # include $(BUILD_PREBUILT)


include $(CLEAR_VARS)
LOCAL_MODULE := tune2fs
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
LOCAL_SRC_FILES := $(LOCAL_MODULE)
include $(BUILD_PREBUILT)


ifeq ($(BOARD_HAS_LARGE_FILESYSTEM),true) # include $(CLEAR_VARS)
include $(CLEAR_VARS) # LOCAL_MODULE := mke2fs
LOCAL_MODULE := mke2fs # LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TAGS := optional # LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES
LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES # LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin # ifeq ($(BOARD_MKE2FS),)
ifeq ($(BOARD_MKE2FS),) # LOCAL_SRC_FILES := $(LOCAL_MODULE)
LOCAL_SRC_FILES := $(LOCAL_MODULE) # else
else # LOCAL_SRC_FILES := ../../../$(BOARD_MKE2FS)
LOCAL_SRC_FILES := ../../../$(BOARD_MKE2FS) # endif
endif # include $(BUILD_PREBUILT)
include $(BUILD_PREBUILT)
endif


BOARD_RECOVERY_RFS_CHECK := $(shell grep rfs $(TARGET_DEVICE_DIR)/recovery.fstab) BOARD_RECOVERY_RFS_CHECK := $(shell grep rfs $(TARGET_DEVICE_DIR)/recovery.fstab)
ifneq ($(BOARD_RECOVERY_RFS_CHECK),) ifneq ($(BOARD_RECOVERY_RFS_CHECK),)
Expand Down

0 comments on commit a465962

Please sign in to comment.