OSDN Git Service
(root)
/
android-x86
/
device-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow packaging factory images from a separate bootloader file
[android-x86/device-common.git]
/
generate-factory-images-common.sh
diff --git
a/generate-factory-images-common.sh
b/generate-factory-images-common.sh
index
ef58ae4
..
5d06a09
100644
(file)
--- a/
generate-factory-images-common.sh
+++ b/
generate-factory-images-common.sh
@@
-22,7
+22,10
@@
then
fi
rm -rf tmp
mkdir -p tmp/$PRODUCT-$VERSION
fi
rm -rf tmp
mkdir -p tmp/$PRODUCT-$VERSION
-unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$BOOTLOADERSRC
+if test "$BOOTLOADERFILE" = ""
+then
+ unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$BOOTLOADERSRC
+fi
if test "$RADIO" != ""
then
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC
if test "$RADIO" != ""
then
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/$RADIOSRC
@@
-32,7
+35,12
@@
then
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img
fi
cp ${SRCPREFIX}$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip
unzip -d tmp ${SRCPREFIX}$PRODUCT-target_files-$BUILD.zip RADIO/radio-cdma.img
fi
cp ${SRCPREFIX}$PRODUCT-img-$BUILD.zip tmp/$PRODUCT-$VERSION/image-$PRODUCT-$VERSION.zip
-cp tmp/RADIO/$BOOTLOADERSRC tmp/$PRODUCT-$VERSION/bootloader-$DEVICE-$BOOTLOADER.img
+if test "$BOOTLOADERFILE" = ""
+then
+ cp tmp/RADIO/$BOOTLOADERSRC tmp/$PRODUCT-$VERSION/bootloader-$DEVICE-$BOOTLOADER.img
+else
+ cp $BOOTLOADERFILE tmp/$PRODUCT-$VERSION/bootloader-$DEVICE-$BOOTLOADER.img
+fi
if test "$RADIO" != ""
then
cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img
if test "$RADIO" != ""
then
cp tmp/RADIO/$RADIOSRC tmp/$PRODUCT-$VERSION/radio-$DEVICE-$RADIO.img