From e99f29a0c5c1427d9696c49f2374314e7e54db9a Mon Sep 17 00:00:00 2001 From: Robert Church Date: Thu, 17 Feb 2022 11:39:12 -0500 Subject: [PATCH] debian: Align ostree/iso to current project needs This commit will update the LAT configuration to: - Change the project name to starlingx - Change the ostree os name to debian - Change from an 'A/B' (dual partition) scheme to an 'A' (single partition) scheme - provide a LAT patch to enable the initramfs-ostree image to align with the project name This will generate: - A single partition scheme for ostree: Partitions will be aligned on 2048-sector boundaries Total free space is 568686525 sectors (271.2 GiB) Number Start (sector) End (sector) Size Code Name 1 2048 4095 1024.0 KiB EF02 bios 2 4096 69631 32.0 MiB EF00 otaefi 3 69632 1118207 512.0 MiB 8300 otaboot 4 1118208 43061247 20.0 GiB 8300 otaroot 5 43061248 85004287 20.0 GiB 8300 fluxdata 6 85004288 146444287 29.3 GiB 8300 platform_backup 7 146444288 521834495 179.0 GiB 8E00 platform_pv - ostree deployments as: $ ostree admin status * debian 26876a4838f7a66d28f725b7edfd59571b69b10e3b113504f0bc49014664cf2c.1 origin refspec: debian:starlingx GPG: Signature made Fri Feb 18 03:43:02 2022 using RSA key ID CFA856DFC7CB87BE GPG: Good signature from "Wind-River-Linux-Sample " debian 26876a4838f7a66d28f725b7edfd59571b69b10e3b113504f0bc49014664cf2c.0 (rollback) origin refspec: debian:starlingx GPG: Signature made Fri Feb 18 03:43:02 2022 using RSA key ID CFA856DFC7CB87BE GPG: Good signature from "Wind-River-Linux-Sample " - build results corresponding to: starlingx-initramfs-intel-x86-64.cpio.gz starlingx-initramfs-ostree-image-intel-x86-64.cpio.gz starlingx-intel-x86-64-cd.iso Change-Id: I9e3b3a367109a82a7ee905df45ca93bf8a1766f0 Story: 2008846 Task: 44532 Signed-off-by: Robert Church --- debian-mirror-tools/config/debian/common/base-bullseye.yaml | 6 +++--- .../config/debian/common/base-initramfs-bullseye.yaml | 2 +- stx.conf.sample | 2 +- stx/dockerfiles/stx-lat-tool.Dockerfile | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-bullseye.yaml index a41f4f65..eb6db9da 100644 --- a/debian-mirror-tools/config/debian/common/base-bullseye.yaml +++ b/debian-mirror-tools/config/debian/common/base-bullseye.yaml @@ -1,5 +1,5 @@ --- -name: debian-image-demo +name: starlingx machine: intel-x86-64 image_type: - iso @@ -106,8 +106,8 @@ environments: - NO_RECOMMENDATIONS="1" - DEBIAN_FRONTEND=noninteractive ostree: - ostree_use_ab: '1' - ostree_osname: wrlinux + ostree_use_ab: '0' + ostree_osname: debian ostree_skip_boot_diff: '2' ostree_remote_url: '' ostree_extra_install_args: 'inststx=1' diff --git a/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml index 8e0220cf..ed20d563 100644 --- a/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml +++ b/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml @@ -1,5 +1,5 @@ --- -name: debian-initramfs-ostree-image +name: starlingx-initramfs machine: intel-x86-64 image_type: - initramfs diff --git a/stx.conf.sample b/stx.conf.sample index e1978d0f..6c48cdee 100644 --- a/stx.conf.sample +++ b/stx.conf.sample @@ -7,7 +7,7 @@ proxyserver = opendev.org proxyport = 8080 buildbranch = master manifest = default.xml -ostree_osname = wrlinux +ostree_osname = debian [builder] uid = 1000 diff --git a/stx/dockerfiles/stx-lat-tool.Dockerfile b/stx/dockerfiles/stx-lat-tool.Dockerfile index 739c9bfe..032ba844 100644 --- a/stx/dockerfiles/stx-lat-tool.Dockerfile +++ b/stx/dockerfiles/stx-lat-tool.Dockerfile @@ -42,5 +42,8 @@ RUN /opt/LAT/AppSDK.sh -d /opt/LAT/SDK -y # Fix: Use Debian CDN address for geo-frendly servers RUN sed -i 's/ftp.cn.debian.org/deb.debian.org/g' /opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/debian_constant.py +# Fix: Align DEFAULT_INITRD_NAME with our custom names +RUN sed -i 's/debian-initramfs-ostree-image/starlingx-initramfs-ostree-image/g' /opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/debian_constant.py + ENTRYPOINT ["/usr/bin/tini", "--"] CMD ["/opt/LAT/lat/latd"]