diff --git a/Android.mk b/Android.mk index edbfa2d..b05476a 100644 --- a/Android.mk +++ b/Android.mk @@ -26,7 +26,7 @@ LOCAL_MODULE := recovery LOCAL_FORCE_STATIC_EXECUTABLE := true -RECOVERY_VERSION := ClockworkMod Recovery v1.8.1.8 +RECOVERY_VERSION := ClockworkMod Recovery v1.8.1.9 LOCAL_CFLAGS := -DRECOVERY_VERSION="$(RECOVERY_VERSION)" RECOVERY_API_VERSION := 2 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION) @@ -35,6 +35,10 @@ ifeq ($(BOARD_HAS_NO_SELECT_BUTTON),true) LOCAL_CFLAGS += -DKEY_POWER_IS_SELECT_ITEM endif +ifeq ($(BOARD_SD_EXT3),true) + LOCAL_CFLAGS += -DSD_EXT3 +endif + # This binary is in the recovery ramdisk, which is otherwise a copy of root. # It gets copied there in config/Makefile. LOCAL_MODULE_TAGS suppresses # a (redundant) copy of the binary in /system/bin for user builds. diff --git a/mkfstab.sh b/mkfstab.sh index c30737f..a1ab0dd 100755 --- a/mkfstab.sh +++ b/mkfstab.sh @@ -32,4 +32,4 @@ do echo "/dev/block/mtdblock$mtd /$mount $type rw" >> /etc/fstab done echo "/dev/block/mmcblk0p1" /sdcard vfat rw >> /etc/fstab -echo "/dev/block/mmcblk0p2" /sd-ext ext4 rw >> /etc/fstab +echo "/dev/block/mmcblk0p2" /sd-ext auto rw >> /etc/fstab diff --git a/roots.c b/roots.c index abfb4ce..a63e6e4 100644 --- a/roots.c +++ b/roots.c @@ -53,7 +53,11 @@ static RootInfo g_roots[] = { { "PACKAGE:", NULL, NULL, NULL, NULL, g_package_file }, { "RECOVERY:", g_mtd_device, NULL, "recovery", "/", g_raw }, { "SDCARD:", "/dev/block/mmcblk0p1", "/dev/block/mmcblk0", NULL, "/sdcard", "vfat" }, +#ifndef SD_EXT3 { "SDEXT:", "/dev/block/mmcblk0p2", NULL, NULL, "/sd-ext", "ext4" }, +#else + { "SDEXT:", "/dev/block/mmcblk0p2", NULL, NULL, "/sd-ext", "ext3" }, +#endif { "SYSTEM:", g_mtd_device, NULL, "system", "/system", "yaffs2" }, { "MBM:", g_mtd_device, NULL, "mbm", NULL, g_raw }, { "TMP:", NULL, NULL, NULL, "/tmp", NULL },