From 264208da1257ed42e06aa8c99d024fa7b545b8d6 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Thu, 19 May 2022 10:24:45 +0800 Subject: [PATCH] build_inf_yocto.sh: add all sstate Add all sstate from 5 images Issue-ID: INF-274 Signed-off-by: Jackie Huang Change-Id: I0c3b61b1521b2834a59d3aed8e6cd05c28625f9f --- scripts/build_inf_yocto/build_inf_yocto.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/build_inf_yocto/build_inf_yocto.sh b/scripts/build_inf_yocto/build_inf_yocto.sh index 6e3d141..cdba10f 100755 --- a/scripts/build_inf_yocto/build_inf_yocto.sh +++ b/scripts/build_inf_yocto/build_inf_yocto.sh @@ -280,7 +280,7 @@ ISO_ANACONDA=${PRJ_BUILD_DIR_ANACONDA}/tmp-glibc/deploy/images/${BSP}/${IMG_ANAC ISO_INF=${PRJ_BUILD_DIR_ANACONDA}/tmp-glibc/deploy/images/${BSP}/${IMG_INF}-${BSP}.iso ISO_INF_ALIAS=${PRJ_OUTPUT_DIR}/inf-image-yocto-aio-${IMG_ARCH}.iso -SSTATE_CONTAINER_IMG=jackiehjm/inf-yocto-sstate:8.3 +SSTATE_CONTAINER_IMG=infbuilder/inf-yocto-sstate:2022.05 prepare_workspace () { msg_step="Create workspace for the build" @@ -302,11 +302,14 @@ get_sstate () { msg_step="Get sstate cache from dockerhub image" echo_step_start - docker pull ${SSTATE_CONTAINER_IMG} - docker create -ti --name inf-yocto-sstate ${SSTATE_CONTAINER_IMG} sh - rm -rf ${PRJ_SHARED_SS_DIR} - docker cp inf-yocto-sstate:/sstate ${PRJ_SHARED_SS_DIR} - docker rm inf-yocto-sstate + for i in {1..5}; do + docker pull ${SSTATE_CONTAINER_IMG}-${i} + docker create -ti --name inf-yocto-sstate-${i} ${SSTATE_CONTAINER_IMG}-${i} sh + docker cp inf-yocto-sstate-${i}:/sstate${i} ${PRJ_SHARED_SS_DIR}/sstate${i} + docker rm inf-yocto-sstate-${i} + done + mv ${PRJ_SHARED_SS_DIR}/sstate*/* ${PRJ_SHARED_SS_DIR} + #rm -rf ${PRJ_SHARED_SS_DIR}/sstate* echo_step_end } @@ -550,7 +553,7 @@ build_anaconda_image () { if [ -z "${DRYRUN}" ]; then cp -Pf ${ISO_ANACONDA} ${ISO_INF} - cp -Pf ${ISO_ANACONDA} ${ISO_INF_ALIAS} + cp -f ${ISO_ANACONDA} ${ISO_INF_ALIAS} fi echo_step_end -- 2.16.6