1-install: support INSTALL_PREFIX

This allows a variant build to specify another install prefix.

diff --git a/Android.mk b/Android.mk
index b743866..0236423 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -50,6 +50,7 @@ $(INITRD_RAMDISK): $(initrd_bin) $(systemimg) $(TARGET_INITRD_SCRIPTS) | $(ACP)
        ln -s /bin/ld-linux.so.2 $(TARGET_INSTALLER_OUT)/lib
        mkdir -p $(addprefix $(TARGET_INSTALLER_OUT)/,android iso mnt proc sys tmp sfs hd)
        echo "VER=$(VER)" > $(TARGET_INSTALLER_OUT)/scripts/00-ver
+       $(if $(INSTALL_PREFIX),echo "INSTALL_PREFIX=$(INSTALL_PREFIX)" >> $(TARGET_INSTALLER_OUT)/scripts/00-ver)
        $(MKBOOTFS) $(TARGET_INSTALLER_OUT) | gzip -9 > $@
 
 INSTALL_RAMDISK := $(PRODUCT_OUT)/install.img

diff --git a/install/scripts/1-install b/install/scripts/1-install
index 49f9ad6..5c226ab 100644 (file)
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -284,7 +284,7 @@ install_to()
        fs=`cat /proc/mounts | grep /dev/$1 | awk '{ print $3 }'`
        cmdline=`sed "s|\(initrd.*img\s*\)||; s|quiet\s*||; s|\(vga=\w\+\?\s*\)||; s|\(DPI=\w\+\?\s*\)||; s|\(INSTALL=\w\+\?\s*\)||; s|\(SRC=\S\+\?\s*\)||; s|\(DEBUG=\w\+\?\s*\)||; s|\(BOOT_IMAGE=\S\+\?\s*\)||; s|\(iso-scan/filename=\S\+\?\s*\)||;" /proc/cmdline`
 
-       asrc=android-$VER
+       [ -n "$INSTALL_PREFIX" ] && asrc=$INSTALL_PREFIX || asrc=android-$VER
        efi="`dmesg | grep EFI.VGA`"
        [ -z "$efi" ] && dialog --title " Confirm " --no-label Skip --defaultno --yesno \
                "\n Do you want to install boot loader GRUB?" 7 47