Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
project bootable/recovery/
diff --git a/etc/init.rc b/etc/init.rc
index c78a44a..2027d25 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -12,6 +12,7 @@ on early-init
start healthd
on init
+ export LD_LIBRARY_PATH .:/sbin
export PATH /sbin:/system/bin
export ANDROID_ROOT /system
export ANDROID_DATA /data
diff --git a/install.cpp b/install.cpp
index 6aadcb7..75549af 100644
--- a/install.cpp
+++ b/install.cpp
@@ -56,7 +56,7 @@ try_update_binary(const char *path, ZipArchive *zip, int* wipe_cache) {
return INSTALL_CORRUPT;
}
- const char* binary = "/tmp/update_binary";
+ const char* binary = "/tmp/update-binary"; //klaus: war underscore
unlink(binary);
int fd = creat(binary, 0755);
if (fd < 0) {
@@ -269,9 +269,12 @@ really_install_package(const char *path, int* wipe_cache, bool needs_mount)
}
LOGI("%d key(s) loaded from %s\n", numKeys, PUBLIC_KEYS_FILE);
- ui->Print("Verifying update package...\n");
+ /*ui->Print("Verifying update package...\n");*/
+ ui->Print("SKIP Verifying update package...\n");
int err;
+err = 0;
+/*
err = verify_file(map.addr, map.length, loadedKeys, numKeys);
free(loadedKeys);
LOGI("verify_file returned %d\n", err);
@@ -280,6 +283,7 @@ really_install_package(const char *path, int* wipe_cache, bool needs_mount)
sysReleaseMap(&map);
return INSTALL_CORRUPT;
}
+*/
/* Try to open the package.
*/
project build/
diff --git a/core/Makefile b/core/Makefile
index fceb6db..053913d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -870,10 +870,12 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) $(RECOVE
$(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/*
$(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res
$(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png
+ cp -R recovery/root/sbin $(TARGET_RECOVERY_ROOT_OUT)
$(hide) $(foreach item,$(recovery_resources_private), \
cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)
$(hide) $(foreach item,$(recovery_fstab), \
cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)
+ ln $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab $(TARGET_RECOVERY_ROOT_OUT)/etc/fstab
$(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys
$(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \
> $(TARGET_RECOVERY_ROOT_OUT)/default.prop
project frameworks/base/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment