android/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hacking away

Browse Source
This commit is contained in:
Koushik Dutta 2010-06-14 12:49:47 -07:00
parent 59bcc7eb3f
commit f8b21c2b4d
4 changed files with 58 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Android.mk
View File

@ -26,7 +26,7 @@ LOCAL_MODULE := recovery
LOCAL_FORCE_STATIC_EXECUTABLE := true
RECOVERY_VERSION := ClockworkMod Recovery v1.8.1.9
RECOVERY_VERSION := ClockworkMod Recovery v1.8.2.5
LOCAL_CFLAGS := -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
RECOVERY_API_VERSION := 2
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
@ -35,10 +35,24 @@ ifeq ($(BOARD_HAS_NO_SELECT_BUTTON),true)
LOCAL_CFLAGS += -DKEY_POWER_IS_SELECT_ITEM
endif
# This file system specific stuff is in need of some serious cleaning up...
ifeq ($BOARD_SDCARD_MMCBLK1,true)
LOCAL_CFLAGS += -DSDCARD_MMCBLK1
endif
ifeq ($(BOARD_SD_EXT3),true)
LOCAL_CFLAGS += -DSD_EXT3
endif
ifeq ($(BOARD_USERDATA_EXT3),true)
LOCAL_CFLAGS += -DUSERDATA_EXT3
endif
ifeq ($(BOARD_CACHE_EXT3),true)
LOCAL_CFLAGS += -DCACHE_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.

10
mkfstab.sh
View File

@ -31,5 +31,11 @@ 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 auto rw >> /etc/fstab
if [ ! -z $SDCARD_MMCBLK1 ]
then
echo "/dev/block/mmcblk1p1" /sdcard vfat rw >> /etc/fstab
echo "/dev/block/mmcblk1p2" /sd-ext auto rw >> /etc/fstab
else
echo "/dev/block/mmcblk0p1" /sdcard vfat rw >> /etc/fstab
echo "/dev/block/mmcblk0p2" /sd-ext auto rw >> /etc/fstab
fi

5
recovery.c
View File

@ -491,7 +491,12 @@ main(int argc, char **argv)
return amend_main(argc, argv);
return busybox_driver(argc, argv);
}
#ifdef SDCARD_MMCBLK1
__system("SDCARD_MMCBLK1=true /sbin/mkfstab.sh");
#else
__system("/sbin/mkfstab.sh");
#endif
__system("/sbin/postrecoveryboot.sh");
int is_user_initiated_recovery = 0;
time_t start = time(NULL);

36
roots.c
View File

@ -45,6 +45,34 @@ static const char g_mtd_device[] = "@\0g_mtd_device";
static const char g_raw[] = "@\0g_raw";
static const char g_package_file[] = "@\0g_package_file";
#ifdef SDCARD_MMCBLK1
#define SDCARD_MMCBLK_SECONDARY "/dev/block/mmcblk1"
#define SDCARD_MMCBLK_PRIMARY "/dev/block/mmcblk1p1"
#define SDEXT "/dev/block/mmcblk1p2"
#else
#define SDCARD_MMCBLK_SECONDARY "/dev/block/mmcblk0"
#define SDCARD_MMCBLK_PRIMARY "/dev/block/mmcblk0p1"
#define SDEXT "/dev/block/mmcblk0p2"
#endif
#ifdef SD_EXT3
#define SD_EXT_FILE_SYSTEM "ext3"
#else
#define SD_EXT_FILE_SYSTEM "ext4"
#endif
#ifdef USERDATA_EXT3
#define SD_EXT_FILE_SYSTEM "ext3"
#else
#define SD_EXT_FILE_SYSTEM "ext4"
#endif
#ifdef CACHE_EXT3
#define SD_EXT_FILE_SYSTEM "ext3"
#else
#define SD_EXT_FILE_SYSTEM "ext4"
#endif
static RootInfo g_roots[] = {
{ "BOOT:", g_mtd_device, NULL, "boot", NULL, g_raw },
{ "CACHE:", g_mtd_device, NULL, "cache", "/cache", "yaffs2" },
@ -52,12 +80,8 @@ static RootInfo g_roots[] = {
{ "MISC:", g_mtd_device, NULL, "misc", NULL, g_raw },
{ "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
{ "SDCARD:", SDCARD_MMCBLK_PRIMARY, SDCARD_MMCBLK_SECONDARY, NULL, "/sdcard", "vfat" },
{ "SDEXT:", SDEXT, NULL, NULL, "/sd-ext", SD_EXT_FILE_SYSTEM },
{ "SYSTEM:", g_mtd_device, NULL, "system", "/system", "yaffs2" },
{ "MBM:", g_mtd_device, NULL, "mbm", NULL, g_raw },
{ "TMP:", NULL, NULL, NULL, "/tmp", NULL },