starlingx/tools
Code Issues Proposed changes

LAT: upgrade to 20220214 to use minbase variant for debootstrap

Browse Source 
Including another 2 fixes

8a9fc84347
b393d2053d

Remove the workaround of minbase in Dockerfile

Test Plan:
- PASS: Rebuild containers
- PASS: Build image
- PASS: Boot image

Story: 2008846
Task: 44194

Signed-off-by: Yue Tao <yue.tao@windriver.com>
Change-Id: I54df6a3cd69eec504052b1cddb881b3ceb3679b0
This commit is contained in:
Yue Tao 2022-02-15 16:31:19 +08:00
parent eec9163e0e
commit 1f391d4de6
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ rootfs-post-scripts:
cp -rf $OECORE_TARGET_SYSROOT/boot/efi/EFI/BOOT/bootx64.efi $DEPLOY_DIR/grub-efi-bootx64.efi
cp -rf $OECORE_TARGET_SYSROOT/boot/efi $IMAGE_ROOTFS/boot/
cp -rf $IMAGE_ROOTFS/boot/*-amd64 $DEPLOY_DIR
KERNEL=`ls $DEPLOY_DIR/vmlinuz-*-amd64`
KERNEL=`ls -t $DEPLOY_DIR/vmlinuz-*-amd64 | head -n 1`
ln -snf --relative $KERNEL $DEPLOY_DIR/bzImage
- |-
# Setup the sysadmin user and force the user to change the password

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

@ -18,6 +18,7 @@ gpg:
BOOT_GPG_PASSPHRASE: SecureCore
BOOT_KEYS_DIR: $OECORE_NATIVE_SYSROOT/usr/share/bootfs/boot_keys
packages:
- apt-utils
- base-passwd
- bash
- busybox
@ -35,7 +36,11 @@ packages:
- grep
- grub2
- gzip
- ifupdown
- initramfs-ostree
- iproute2
- isc-dhcp-client
- isc-dhcp-common
- kbd
- kmod
- libostree-1-1=2019.1-1
@ -46,6 +51,7 @@ packages:
- ostree-boot=2019.1-1
- ostree=2019.1-1
- parted
- procps
- psmisc
- pv
- rng-tools

7
stx/dockerfiles/stx-lat-tool.Dockerfile
View File

@ -16,7 +16,7 @@ FROM debian:bullseye
MAINTAINER Chen Qi <Qi.Chen@windriver.com>
ARG LAT_BINARY_RESOURCE_PATH=http://mirror.starlingx.cengn.ca/mirror/lat-sdk/lat-sdk-20211216
ARG LAT_BINARY_RESOURCE_PATH=http://mirror.starlingx.cengn.ca/mirror/lat-sdk/lat-sdk-20220214
# Install necessary packages
RUN apt-get -y update && apt-get --no-install-recommends -y install \
@ -39,11 +39,6 @@ ADD ${LAT_BINARY_RESOURCE_PATH}/lat-sdk.sh /opt/LAT/AppSDK.sh
RUN chmod +x /opt/LAT/AppSDK.sh
RUN /opt/LAT/AppSDK.sh -d /opt/LAT/SDK -y
# Workaround for using minbase variant for debootstrap
# See https://bugs.launchpad.net/starlingx/+bug/1959607
RUN sed -i -e 's#--no-check-gpg#--variant=minbase --no-check-gpg#g' \
/opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/package_manager/deb/__init__.py
# 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