starlingx/tools
Code Issues Proposed changes

Clear upgrades folder inside iso

Browse Source 
This commit changes the content from upgrades folder in the iso:
- Remove unnecessary files being copied during the build (both
  scripts are being called from another directory, the versioned
  one under /opt/software)
- Allow copying symlinks to upgrade scripts (see [1])

[1] https://review.opendev.org/c/starlingx/update/+/945661

Test Plan
PASS: build iso, verify contents are as expected inside iso
PASS: AIO-SX - install/bootstrap/unlock
PASS: AIO-DX - e2e stx-10 -> stx-11 upgrade

Story: 2011357
Task: 51926

Change-Id: Ib8b6e2cf30a18322cccb0478bf3a693a65ebfadd
Signed-off-by: Heitor Matsui <heitorvieira.matsui@windriver.com>
This commit is contained in:
Heitor Matsui 2025-04-03 15:47:17 -03:00
parent ec7c9b51cf
commit 3d3006c6ef
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian-mirror-tools/config/debian/common/base-bullseye.yaml
View File

@ -294,10 +294,7 @@ iso-post-script: |
RELEASE_VER=$(cat ${IMAGE_ROOTFS}/etc/build.info | grep SW_VERSION | cut -f2 -d'=' | tr -d '"')
mkdir -p upgrades
cp ${IMAGE_ROOTFS}/etc/pxeboot-update-${RELEASE_VER}.sh upgrades/
cp ${IMAGE_ROOTFS}/usr/sbin/software-deploy/deploy-precheck upgrades/
cp ${IMAGE_ROOTFS}/usr/sbin/software-deploy/upgrade_utils.py upgrades/
cp ${IMAGE_ROOTFS}/opt/upgrades/metadata.xml upgrades/
cp ${IMAGE_ROOTFS}/usr/sbin/software-deploy/usm_load_import upgrades/
sed -i "s/xxxSW_VERSIONxxx/${RELEASE_VER}/g" upgrades/metadata.xml
if [ -f "/localdisk/workdir/${IMAGE_NAME}/packages.yaml" ]; then
# Here we collect all the packages file names
@ -315,12 +312,13 @@ iso-post-script: |
CHECKSUM_OSTREE=$(ostree --repo=ostree_repo log starlingx | grep -i checksum | sed "s/.* //")
sed -i "s,xxxBASECHECKSUMxxx,$CHECKSUM_OSTREE,g" ${IMAGE_ROOTFS}/etc/software/*-metadata.xml
mkdir -p patches
# Copy metadata files to directories in ISO
cp ${IMAGE_ROOTFS}/etc/software/*-metadata.xml upgrades/
cp ${IMAGE_ROOTFS}/etc/software/*-metadata.xml patches/
echo -n "VERSION=${RELEASE_VER}" > upgrades/version
mkdir -p upgrades/software-deploy
# Copy all software-deploy scripts to upgrades/software-deploy in ISO
cp ${IMAGE_ROOTFS}/usr/sbin/software-deploy/* upgrades/software-deploy/
mkdir -p upgrades/software-deploy
cp -P ${IMAGE_ROOTFS}/usr/sbin/software-deploy/* upgrades/software-deploy/
# 3. ISO
# 3.1 Edit grub.cfg and isolinux.cfg