From db590880210aa27bf3f5b2252097f1638f01bf2d Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Fri, 10 May 2024 01:38:48 +0000 Subject: [PATCH] tools: remove kernel abiname/version number from Dockerfile 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 (cherry picked from commit dccac79ea9cec25e6c876d2b7af07124a5659e09) Signed-off-by: Jiping Ma --- tools/base-images/stx-debian-dev/debian/docker/Dockerfile | 4 ++-- .../vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/base-images/stx-debian-dev/debian/docker/Dockerfile b/tools/base-images/stx-debian-dev/debian/docker/Dockerfile index 5d87158f..00e13ab5 100644 --- a/tools/base-images/stx-debian-dev/debian/docker/Dockerfile +++ b/tools/base-images/stx-debian-dev/debian/docker/Dockerfile @@ -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 \ diff --git a/tools/vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile b/tools/vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile index 51b60532..b669ec45 100644 --- a/tools/vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile +++ b/tools/vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile @@ -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 \