starlingx/utilities
Code Issues Proposed changes

tools: remove kernel abiname/version number from Dockerfile

Browse Source 
The package name linux-headers-5.10.0-6 is invalid for any kernel
version. Replace it with kernel headers package name without abiname.

The package name linux-perf-5.10 doesn't exist for kernel 6.6 build
any more. Use package "linux-perf" on kernel 6.6 build to replace it.

Test Plan:
PASS: build the docker images stx-debian-dev and stx-debian-tools-dev
      using below commands.
      $ cd $MY_REPO/build-tools/build-docker-images
      $ ./build-stx-base.sh --local --version DEV --cache
      $ ./build-stx-images.sh -N --base $USER/stx-debian:DEV --cache
        --only stx-debian-dev,stx-debian-tools-dev

Closes-Bug: 2065183
Change-Id: I7ba668794ae2f53b46ddb286ee7f4f81130ee6f4
Signed-off-by: Li Zhou <li.zhou@windriver.com>
(cherry picked from commit dccac79ea9cec25e6c876d2b7af07124a5659e09)
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
This commit is contained in:
Li Zhou 2024-05-10 01:38:48 +00:00 committed by Jiping Ma
parent 737e9dcafc
commit db59088021
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/base-images/stx-debian-dev/debian/docker/Dockerfile
View File

@ -73,8 +73,8 @@ RUN set -ex && \
libhwloc-dev=1.11.12-3 \
libjson-c-dev \
libssl-dev \
linux-headers-5.10.0-6 \
linux-perf-5.10 \
linux-headers-stx-amd64 \
linux-perf \
make \
pciutils \
python-is-python3 \

4
tools/vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile
View File

@ -75,8 +75,8 @@ RUN set -ex && \
libhwloc-dev=1.11.12-3 \
libjson-c-dev \
libssl-dev \
linux-headers-5.10.0-6 \
linux-perf-5.10 \
linux-headers-stx-amd64 \
linux-perf \
make \
pciutils \
python-is-python3 \