From d3434a623e580c936ff1362f962afb979325d2b1 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Tue, 1 Oct 2024 17:48:59 +0100 Subject: [PATCH] fixup! lmp/build: check availability of the image manifest --- lmp/build.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lmp/build.sh b/lmp/build.sh index 996bf40..990e1d2 100755 --- a/lmp/build.sh +++ b/lmp/build.sh @@ -82,10 +82,10 @@ rm -f ${DEPLOY_DIR_IMAGE}/*.txt rm -f ${DEPLOY_DIR_IMAGE}/*.wic # Link the license manifest for all the images produced by the build -for img in ${DEPLOY_DIR_IMAGE}/*${MACHINE}.manifest; do +for img in ${DEPLOY_DIR_IMAGE}/*${MACHINE}*.manifest; do if ! [ -e "${img}" ]; then - status "Image manifest not found, license manifest will be skipped" - break + status "Image manifest not found, license manifest can't be collected" + eixt 1 fi image_name=`basename ${img} | sed -e "s/.manifest//"` image_name_id=`readlink ${img} | sed -e "s/\..*manifest//"` @@ -93,14 +93,16 @@ for img in ${DEPLOY_DIR_IMAGE}/*${MACHINE}.manifest; do cp ${DEPLOY_DIR}/licenses/${image_name_id}/license.manifest ${DEPLOY_DIR_IMAGE}/${image_name_id}.license.manifest ln -sf ${image_name_id}.license.manifest ${DEPLOY_DIR_IMAGE}/${image_name}.license.manifest else - status "Image ${image_name_id} license.manifest not found, skipping" + status "Image ${image_name_id} license.manifest not found, license manifest can't be collected" + eixt 1 fi # Also take care of the image_license, which contains the binaries used by wic outside the rootfs if [ -f ${DEPLOY_DIR}/licenses/${image_name_id}/image_license.manifest ]; then cp ${DEPLOY_DIR}/licenses/${image_name_id}/image_license.manifest ${DEPLOY_DIR_IMAGE}/${image_name_id}.image_license.manifest ln -sf ${image_name_id}.image_license.manifest ${DEPLOY_DIR_IMAGE}/${image_name}.image_license.manifest else - status "Image ${image_name_id} image_license.manifest not found, skipping" + status "Image ${image_name_id} image_license.manifest not found, license manifest can't be collected" + eixt 1 fi done