diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2020-05-27 14:41:20 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2020-05-27 14:41:38 +0100 |
| commit | ec1004e81b6c61191697bc365ea21f41c02347a5 (patch) | |
| tree | e7311a6f8806e4464600d92c93d79bf37288b58f | |
| parent | 3a8e060de5c1c47ef1d8c783628ed02fd6eb2692 (diff) | |
se: remove duplicate kernel files
Stashing the images from the first build causes duplicate kernel
binaries to be placed in the deploy dir.
Change-Id: If244a2a80303e0c78b3595f2ffb7add09d8a1aee
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rwxr-xr-x | schneider-openembedded/builders.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/schneider-openembedded/builders.sh b/schneider-openembedded/builders.sh index ea56e2be41..64c3da1521 100755 --- a/schneider-openembedded/builders.sh +++ b/schneider-openembedded/builders.sh @@ -208,17 +208,32 @@ cp -aR ${DEPLOY_DIR_SDK} ${DEPLOY_DIR_IMAGE} # Copy license and manifest information into the deploy dir cp -aR ./tmp/deploy/licenses/dip-image-dev-*/*.manifest ${DEPLOY_DIR_IMAGE} -ls -al ${DEPLOY_DIR_IMAGE}/* +ls -al ${DEPLOY_DIR_IMAGE} +ls -al ${DEPLOY_DIR_IMAGE}/optee # now build dip-image-edge if it was in ${IMAGES} if [[ "${IMAGES}" == *"${edgeimg}"* ]]; then rm -rf ${DEPLOY_DIR_IMAGE}-pre + + # stash the deployed images for later mv ${DEPLOY_DIR_IMAGE} ${DEPLOY_DIR_IMAGE}-pre + + # replace layer meta-dip-dev with meta-edge and then build dip-image-edge mkdir -p ${DEPLOY_DIR_IMAGE} sed -i conf/bblayers.conf -e 's#meta-dip-dev#meta-edge#' time bitbake ${bbopt} ${edgeimg} + + # The kernel will exist in both ${DEPLOY_DIR_IMAGE} and ${DEPLOY_DIR_IMAGE}-pre + # The files will be binary identical, but have different date stamps + # So remove the newer ones + rm -f ${DEPLOY_DIR_IMAGE}/zImage-*.bin + rm -f ${DEPLOY_DIR_IMAGE}/*.dtb + rm -f ${DEPLOY_DIR_IMAGE}/modules-*.tgz + + # Move the saved images back to the deploy dir mv ${DEPLOY_DIR_IMAGE}-pre/* ${DEPLOY_DIR_IMAGE} - ls -al ${DEPLOY_DIR_IMAGE}/* + ls -al ${DEPLOY_DIR_IMAGE} + ls -al ${DEPLOY_DIR_IMAGE}/optee fi # Prepare files to publish |