starlingx/tools
Code Issues Proposed changes

Remove kernel pkgs with abiname in yaml config files

Browse Source 
Remove the kernel image packages with abiname in LAT yaml config files.
After commit <Add pkgs without abiname for image/headers>, packages
for linux unsigned images without abiname are created.
So replace
linux-image-5.10.0-6-amd64-unsigned
linux-rt-image-5.10.0-6-rt-amd64-unsigned
with
linux-image-stx-amd64
linux-rt-image-stx-amd64

This is a preparation for kernel upgrading with major version.

Test plan:
 PASS: Build all the packages and iso successfully.
 PASS: The rt/std installations are fine for both qemu and lib.
 PASS: No warning appears for insmod/modprobe.

Depends-On: https://review.opendev.org/c/starlingx/kernel/+/896187

Story: 2010643
Task: 48816

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Change-Id: I22c1481527b5b0f73d63f7811f8c4f07401839eb
This commit is contained in:
Li Zhou 2023-09-15 14:18:11 +08:00
parent bbf2d7ec75
commit 48f28a811d
3 changed files with 4 additions and 4 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

@ -44,7 +44,7 @@ rootfs-pre-scripts:
# Speed up apt/dpkg used for running build-image
echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/unsafe-io
apt update
apt install -y --no-install-recommends linux-image-5.10.0-6-amd64-unsigned linux-rt-image-5.10.0-6-rt-amd64-unsigned grub-common
apt install -y --no-install-recommends linux-image-stx-amd64 linux-rt-image-stx-amd64 grub-common
apt install -y --allow-downgrades --allow-unauthenticated --no-install-recommends ostree ostree-boot libostree-1-1 ostree-upgrade-mgr
apt install --no-install-recommends -y ifupdown
apt install -y bc vim uuid-runtime iputils-ping

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

@ -68,8 +68,8 @@ packages:
- kbd
- kmod
- libostree-1-1
- linux-image-5.10.0-6-amd64-unsigned
- linux-rt-image-5.10.0-6-rt-amd64-unsigned
- linux-image-stx-amd64
- linux-rt-image-stx-amd64
- mdadm
- mlnx-ofed-kernel-modules
- mlnx-ofed-kernel-modules-rt

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

@ -61,7 +61,7 @@ RUN sed -i 's/ftp.cn.debian.org/deb.debian.org/g' /opt/LAT/SDK/sysroots/x86_64-w
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
# Fix: Align kernel with custom starlingx kernel
RUN sed -i 's/linux-image-amd64/linux-image-5.10.0-6-amd64-unsigned/g' /opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/debian_constant.py
RUN sed -i 's/linux-image-amd64/linux-image-stx-amd64/g' /opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/debian_constant.py
RUN sed -i 's/Wind River Linux Graphics development .* ostree/StarlingX ostree/g' /opt/LAT/SDK/sysroots/corei7-64-wrs-linux/boot/efi/EFI/BOOT/grub.cfg