diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2018-05-29 11:11:26 +0100 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2018-05-29 10:47:19 +0000 |
| commit | b28bdae9163a1658116a22352d46b6489b30e1da (patch) | |
| tree | 7340f283863e43ac6fe241288189dadac2b4721e /openembedded-lkft | |
| parent | 97144c0d229c3641debea7f5709b8f70804d8138 (diff) | |
openembedded-lkft/builders-generic.sh: fix regex for finding files
The build script produces image files with names starting with
"rpb-console-image-". The build script was looking for names starting
with "rpb-console-image-test-". This patch fixes the problem. It also
updates the SYSTEM_URL variable to the sparse image produced to align it
with openembedded-lkft/builders.sh
Change-Id: I1d08c710d891c54d910533862aa129c6be6636f0
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Diffstat (limited to 'openembedded-lkft')
| -rwxr-xr-x | openembedded-lkft/builders-generic.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openembedded-lkft/builders-generic.sh b/openembedded-lkft/builders-generic.sh index 5512ef41a4..fad515884f 100755 --- a/openembedded-lkft/builders-generic.sh +++ b/openembedded-lkft/builders-generic.sh @@ -207,10 +207,10 @@ fi # Need different files for each machine BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}*.img" | sort | xargs -r basename) -ROOTFS_EXT4_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename) -ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename) -ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) -ROOTFS_DESKTOP_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-desktop-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) +ROOTFS_EXT4_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename) +ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename) +ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) +ROOTFS_DESKTOP_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-desktop-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "uImage-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename) case "${MACHINE}" in am57xx-evm) @@ -247,7 +247,7 @@ BOOT_URL=${BASE_URL}/${PUB_DEST}/${BOOT_IMG} ROOTFS_BUILD_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_EXT4_IMG} ROOTFS_SPARSE_BUILD_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG} ROOTFS_DESKTOP_SPARSE_BUILD_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_DESKTOP_IMG} -SYSTEM_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_EXT4_IMG} +SYSTEM_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG} KERNEL_URL=${BASE_URL}/${PUB_DEST}/${KERNEL_IMG} DTB_URL=${BASE_URL}/${PUB_DEST}/${DTB_IMG} NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_TARXZ_IMG} |