diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-bullseye.yaml index cd5d15caa..222d2c59e 100644 --- a/debian-mirror-tools/config/debian/common/base-bullseye.yaml +++ b/debian-mirror-tools/config/debian/common/base-bullseye.yaml @@ -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 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 029207d4d..8e0220cfa 100644 --- a/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml +++ b/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml @@ -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 diff --git a/stx/dockerfiles/stx-lat-tool.Dockerfile b/stx/dockerfiles/stx-lat-tool.Dockerfile index b87aa7a23..739c9bfed 100644 --- a/stx/dockerfiles/stx-lat-tool.Dockerfile +++ b/stx/dockerfiles/stx-lat-tool.Dockerfile @@ -16,7 +16,7 @@ FROM debian:bullseye MAINTAINER Chen Qi -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