diff options
| author | Daniel Díaz <daniel.diaz@linaro.org> | 2018-06-25 17:45:55 -0500 |
|---|---|---|
| committer | Daniel Díaz <daniel.diaz@linaro.org> | 2018-07-05 18:03:57 +0000 |
| commit | fa0c45f4c95cc1581b1b4df1d828c65768ff3b2f (patch) | |
| tree | 229b4f55d50d7f7434e1d9cf555e99d7973f32c3 /openembedded-lkft | |
| parent | e6f23c3df5550767b3900299eea9ba51766584ac (diff) | |
openembedded-lkft: use rpb-console-image-lkft for testing
The LKFT image, based off the standard RPB console image, is
best suited for LKFT testing, as it includes only the required
packages and has special directives for the size of the root
file system, in order to make this image useful for the
selection of LKFT boards.
Change-Id: Ie3a41b7ffa7e0acb6a0e5630ae4570a97dff13ae
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'openembedded-lkft')
| -rwxr-xr-x | openembedded-lkft/builders.sh | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/openembedded-lkft/builders.sh b/openembedded-lkft/builders.sh index 6ca13a58ce..a4478eaac0 100755 --- a/openembedded-lkft/builders.sh +++ b/openembedded-lkft/builders.sh @@ -192,10 +192,6 @@ cat ${distro_conf} # Temporary sstate cleanup to get lkft metadata generated bitbake -c cleansstate kselftests-mainline kselftests-next ltp libhugetlbfs -if [ "${JOB_NAME:0:28}" = "openembedded-lkft-linux-next" ]; then - IMAGES="rpb-console-image-lkft" -fi - time bitbake ${IMAGES} DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"') @@ -273,19 +269,10 @@ done BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}*.img" | sort | xargs -r basename) KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename) - -# FIXME: Only use LKFT image with linux-next for the time being. -if [ "${JOB_NAME:0:28}" = "openembedded-lkft-linux-next" ]; then - ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) - ROOTFS_EXT4=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename) - ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename) - HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.hddimg.xz" | xargs -r basename) -else - ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) - ROOTFS_EXT4=$(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) - HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.hddimg.xz" | xargs -r basename) -fi +ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename) +ROOTFS_EXT4=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename) +ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename) +HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.hddimg.xz" | xargs -r basename) case "${MACHINE}" in am57xx-evm) # QEMU arm 32bit needs the zImage file, not the uImage file. |