diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2013-10-22 12:10:27 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2013-10-22 12:10:27 +0530 |
| commit | eb5bdb741c221dcbc2e23164db597a276cbb6218 (patch) | |
| tree | 9004e7875b2f68adcc71c2d1a399aae78b2e04c1 /build-scripts | |
| parent | 0a7ae96572c9474049ca3bd01609b073ea28be3a (diff) | |
Add bootloader type parameter for deploy_linaro_android_image command while submitting jobs. Default: u_boot
Diffstat (limited to 'build-scripts')
| -rw-r--r-- | build-scripts/build-android | 6 | ||||
| -rwxr-xr-x | build-scripts/post-build-lava.py | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index 5198e5b..b153712 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -134,6 +134,12 @@ else fi +if [ ! -n "$BOOTLOADER_TYPE" ]; +then + echo "BOOTLOADER_TYPE not set. Default: u_boot" + BOOTLOADER_TYPE = u_boot +fi + # Create filesystem images if [ -n "$BUILD_FS_IMAGE" ]; then FS_IMAGE_SIZE=${FS_IMAGE_SIZE-2G} diff --git a/build-scripts/post-build-lava.py b/build-scripts/post-build-lava.py index d31ac37..537d679 100755 --- a/build-scripts/post-build-lava.py +++ b/build-scripts/post-build-lava.py @@ -81,6 +81,7 @@ ENV_BUILD_URL = 'BUILD_URL' ENV_DEFAULT_TIMEOUT = 'DEFAULT_TIMEOUT' # Target product name, user defined, e.g. pandaboard ENV_TARGET_PRODUCT = 'TARGET_PRODUCT' +ENV_BOOTLOADER_TYPE = 'BOOTLOADER_TYPE' class LAVADeviceBase(object): @@ -481,7 +482,8 @@ def gen_deploy_action(): "system": "%s%s%s" % (download_url, "/system.", file_extension), "data": "%s%s%s" % (download_url, - "/userdata.", file_extension) + "/userdata.", file_extension), + "bootloader": get_env_var(ENV_BOOTLOADER_TYPE) }, "metadata": { "android.name": job_name, |