Skip to content

Commit

Permalink
move backup lists and update script to releasetools
Browse files Browse the repository at this point in the history
Change-Id: I887a2bf324a3a3e7b56d4736e44effa6c89a2209
  • Loading branch information
tpruvot committed Apr 5, 2012
1 parent 379a0c9 commit 777b267
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 8 deletions.
7 changes: 4 additions & 3 deletions jordan-blobs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,14 @@ PRODUCT_COPY_FILES += \
device/motorola/jordan/modules/modules.alias:system/lib/modules/modules.alias \
device/motorola/jordan/modules/modules.dep:system/lib/modules/modules.dep \

# List of files to keep against rom upgrade (baseband config, overclock settings)
ifdef CYANOGEN_RELEASE
PRODUCT_COPY_FILES += device/motorola/jordan/custom_backup_release.txt:system/etc/custom_backup_list.txt
PRODUCT_COPY_FILES += device/motorola/jordan/releasetools/custom_backup_release.txt:system/etc/custom_backup_list.txt
else
PRODUCT_COPY_FILES += device/motorola/jordan/custom_backup_list.txt:system/etc/custom_backup_list.txt
PRODUCT_COPY_FILES += device/motorola/jordan/releasetools/custom_backup_list.txt:system/etc/custom_backup_list.txt
endif

#app
# App
PRODUCT_COPY_FILES += \
device/motorola/jordan/prebuilt/app/basebandswitcherV4.0.apk:system/app/basebandswitcherV4.0.apk \
device/motorola/jordan/prebuilt/app/DroidSSHd.apk:system/app/DroidSSHd.apk \
Expand Down
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions releasetools/multiboot_backup_list.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
bootmenu/script/2nd-system.sh
bootmenu/config/multiboot_defaultpath.conf
bootmenu/binary/multiboot
bootmenu/2nd-system/fshook.functions.sh
bootmenu/2nd-system/fshook.bootrecovery.sh
bootmenu/2nd-system/init.hook.rc
bootmenu/2nd-system/fshook.prevent_unmount.sh
bootmenu/2nd-system/fshook.edit_devtree.sh
bootmenu/2nd-system/fshook.config.sh
bootmenu/2nd-system/fshook.postfshook.sh
bootmenu/2nd-system/recovery/sbin/recoveryexit.sh
bootmenu/2nd-system/recovery/res/images/icon_bootmenu.png
bootmenu/2nd-system/recovery/res/images/icon_clockwork.png

4 changes: 4 additions & 0 deletions releasetools/squisher
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
echo "JORDAN SQUISHER:"
echo "================"

DEVICE_OUT=$ANDROID_BUILD_TOP/out/target/product/jordan
DEVICE_TOP=$ANDROID_BUILD_TOP/device/motorola/jordan
VENDOR_TOP=$ANDROID_BUILD_TOP/vendor/motorola/jordan

OUT_TARGET_HOST=`uname -a | grep Darwin`
if [ -z "$OUT_TARGET_HOST" ]
then
Expand Down
17 changes: 12 additions & 5 deletions releasetools/squisher.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# This script is included in squisher
# It is the final build step (after OTA package)

DEVICE_OUT=$ANDROID_BUILD_TOP/out/target/product/jordan
DEVICE_TOP=$ANDROID_BUILD_TOP/device/motorola/jordan
VENDOR_TOP=$ANDROID_BUILD_TOP/vendor/motorola/jordan
# set in squisher
# DEVICE_OUT=$ANDROID_BUILD_TOP/out/target/product/jordan
# DEVICE_TOP=$ANDROID_BUILD_TOP/device/motorola/jordan
# VENDOR_TOP=$ANDROID_BUILD_TOP/vendor/motorola/jordan

# Delete unwanted apps
rm -f $REPACK/ota/system/app/RomManager.apk
Expand All @@ -23,13 +24,19 @@ cp $REPACK/ota/system/etc/terminfo/l/linux $REPACK/ota/system/etc/terminfo/x/xte

# prebuilt boot, devtree, logo & updater-script
rm -f $REPACK/ota/boot.img
cp -f $DEVICE_TOP/updater-script $REPACK/ota/META-INF/com/google/android/updater-script
cp -f $DEVICE_TOP/releasetools/updater-script $REPACK/ota/META-INF/com/google/android/updater-script

# keep multiboot specific files, if installed
cat $DEVICE_TOP/releasetools/multiboot_backup_list.txt >> $REPACK/ota/system/etc/custom_backup_list.txt

# release builds contains a kernel, and do not backup kernel modules
if [ -n "$CYANOGEN_RELEASE" ]; then
cat $DEVICE_TOP/updater-script-rel >> $REPACK/ota/META-INF/com/google/android/updater-script
cat $DEVICE_TOP/releasetools/updater-script-rel >> $REPACK/ota/META-INF/com/google/android/updater-script
cp -f $VENDOR_TOP/boot-222-179-4.smg $REPACK/ota/boot.img
cp -f $VENDOR_TOP/devtree-222-179-2.smg $REPACK/ota/devtree.img
cp -f $DEVICE_TOP/logo-google.raw $REPACK/ota/logo.img
fi

cp -f $DEVICE_OUT/root/init $REPACK/ota/system/bootmenu/2nd-init/init
cp -f $DEVICE_OUT/root/init.rc $REPACK/ota/system/bootmenu/2nd-init/init.rc

File renamed without changes.
File renamed without changes.

0 comments on commit 777b267

Please sign in to comment.