From e6df33e19dd94d0e7839923089b02ddbd5f92fb9 Mon Sep 17 00:00:00 2001 From: Mike Sul Date: Fri, 31 Jan 2025 10:36:46 +0100 Subject: [PATCH 1/2] build.sh: Enforce naming schema of image artifact Make sure that the CI artifact of the image bitbaked by the LmP build is named according to the expected schema, i.e. `${IMAGE}-${MACHINE}.wic.gz`., e.g. `lmp-factory-image-intel-corei7-64.wic.gz`. Signed-off-by: Mike Sul --- lmp/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lmp/build.sh b/lmp/build.sh index d58f96c0..80e77938 100755 --- a/lmp/build.sh +++ b/lmp/build.sh @@ -204,8 +204,8 @@ if [ -d "${archive}" ] ; then fi # Make the main img.gz and respective bmap file be in the root of the archive - mv ${archive}/other/lmp-*.wic.gz ${archive}/ || true - mv ${archive}/other/lmp-*.wic.bmap ${archive}/ || true + mv ${archive}/other/lmp-*.wic.gz ${archive}/${IMAGE}-${MACHINE}.wic.gz || true + mv ${archive}/other/lmp-*.wic.bmap ${archive}/${IMAGE}-${MACHINE}.wic.bmap || true # Qcom targets use a qcomflash tarball mv ${archive}/other/lmp-*.qcomflash.tar.gz ${archive}/ || true # NVIDIA targets use a tegraflash tarball From 5abd7b37d1c3d3f4f087373064d18e1d91e86a53 Mon Sep 17 00:00:00 2001 From: Mike Sul Date: Fri, 31 Jan 2025 11:11:55 +0100 Subject: [PATCH 2/2] build.sh: Adjust ota-ext4 removing to different naming Take into account that the `ota-ext4` file can be prefixed with `rootfs` in the newer versions of yocto/LmP. We need to take into account both naming schemas, with and without the prefix. Signed-off-by: Mike Sul --- lmp/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lmp/build.sh b/lmp/build.sh index 80e77938..720cf221 100755 --- a/lmp/build.sh +++ b/lmp/build.sh @@ -199,8 +199,8 @@ if [ -d "${archive}" ] ; then cp ${DEPLOY_DIR_SDK}/lmp*.sh ${archive}/sdk/ || true # Remove ota-ext4 in case the compressed format is available (to reduce time spent uploading) - if [ -f ${archive}/other/${IMAGE}-${MACHINE}.ota-ext4.gz ]; then - rm -f ${archive}/other/${IMAGE}-${MACHINE}.ota-ext4 + if [ -f ${archive}/other/${IMAGE}-${MACHINE}.ota-ext4.gz ] || [ -f ${archive}/other/${IMAGE}-${MACHINE}.rootfs.ota-ext4.gz ]; then + rm -f ${archive}/other/${IMAGE}-${MACHINE}*.ota-ext4 fi # Make the main img.gz and respective bmap file be in the root of the archive