From 81c5b2e415f6242977a2b14c40bdad68e3a45a00 Mon Sep 17 00:00:00 2001 From: Rogerio Ferraz Date: Sat, 3 Dec 2022 18:42:14 +0000 Subject: [PATCH] Added support to Intel Quartzville tools The Intel Quartzville (QV) tools is a bundle of network utilities that support validation, debug, and IEEE Conformance testing of Intel network adapters; identification and diagnostics of Intel PCI adapters, collection of properties and assigned resources, for automation; and an EEPROM programming utility. The Quartzville tools are proprietary, but the Intel QV Linux (iqvlinux) driver is licensed as open source (GPL2), and it shall be supported as a kernel module in StarlingX. This commit adds container-based support of Intel Quartzville (QV) tools in StarlingX, as a facility to users that own a valid Intel QV license, so they may install QV tools into the container stx-debian-tools-dev. The following packages are added: kmod, tree The following packages are moved from Debian Vanilla repo to StarlingX repo, so they can be version-controlled: autoconf-archive, autogen, cmake, doxygen, dwarves, git, git-review, libcap-dev, libjson-c-dev, linux-perf-5.10, ncurses-dev, sphinx-doc, unzip, uuid-dev. Test Plan: - Container image is built successfully on Debian (PASS) Story: 2010138 Task: 46733 Depends-On: https://review.opendev.org/c/starlingx/tools/+/866534 Signed-off-by: Rogerio Ferraz Change-Id: I86b99f6502b32f832497ed30ffbb397d24430823 --- .../stx-debian-dev/debian/docker/Dockerfile | 49 ++++++++----------- .../debian/docker/Dockerfile | 46 +++++++---------- 2 files changed, 38 insertions(+), 57 deletions(-) diff --git a/tools/base-images/stx-debian-dev/debian/docker/Dockerfile b/tools/base-images/stx-debian-dev/debian/docker/Dockerfile index b4c42321..07a07a75 100644 --- a/tools/base-images/stx-debian-dev/debian/docker/Dockerfile +++ b/tools/base-images/stx-debian-dev/debian/docker/Dockerfile @@ -7,7 +7,6 @@ COPY stx-dev.list /etc/apt/sources.list.d/stx-dev.list.disabled # # repos: # /etc/apt/sources.list.d/ -# debian.list.disabled - vanilla debian repo # stx-x.list.disabled - starlingx binary & build repos # # To enable a repo list: @@ -27,32 +26,6 @@ RUN set -ex && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -# Install packages provided only by Debian. -RUN set -ex && \ - cp -f /etc/apt/sources.list.d/debian.list.disabled /etc/apt/sources.list.d/debian.list && \ - cp -f /etc/apt/sources.list.d/stx.list.disabled /etc/apt/sources.list.d/stx.list && \ - apt-get update -y && \ - apt-get install -y \ - autoconf-archive \ - autogen \ - cmake \ - doxygen \ - dwarves \ - git \ - git-review \ - libcap-dev \ - libjson-c-dev \ - linux-perf-5.10 \ - ncurses-dev \ - sphinx-doc \ - unzip \ - uuid-dev \ - && \ - rm -f /etc/apt/sources.list.d/debian.list && \ - rm -f /etc/apt/sources.list.d/stx.list && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - # Enable stx repo only. Packages installs below this point will use # only the managed locally-built & 3rd-party repos. RUN set -ex && \ @@ -63,27 +36,45 @@ RUN set -ex && \ apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y \ + autoconf-archive \ + autogen \ automake \ bash \ bc \ bison \ + cmake \ curl \ + doxygen \ + dwarves \ fakeroot \ flex \ - gcc \ g++ \ + gcc \ + genisoimage \ gettext \ isomd5sum \ + kmod \ + libcap-dev \ libelf-dev \ + libncurses-dev \ libhwloc-dev=1.11.12-3 \ + libjson-c-dev \ libssl-dev \ linux-headers-5.10.0-6 \ + linux-perf-5.10 \ make \ - mkisofs \ + pciutils \ + python-is-python3 \ + python3-intelhex \ + python3-pip \ + python3-pybind11 \ python3-yaml \ rsync \ sphinx-common \ + sphinx-doc \ sudo \ + sysvinit-utils \ + uuid-dev \ vim \ wget \ xz-utils \ 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 f0786d44..73bed580 100644 --- a/tools/vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile +++ b/tools/vran-tools/stx-debian-tools-dev/debian/docker/Dockerfile @@ -27,32 +27,6 @@ RUN set -ex && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -# Install packages provided only by debian. -RUN set -ex && \ - cp -f /etc/apt/sources.list.d/debian.list.disabled /etc/apt/sources.list.d/debian.list && \ - cp -f /etc/apt/sources.list.d/stx.list.disabled /etc/apt/sources.list.d/stx.list && \ - apt-get update -y && \ - apt-get install -y \ - autoconf-archive \ - autogen \ - cmake \ - doxygen \ - dwarves \ - git \ - git-review \ - libcap-dev \ - libjson-c-dev \ - linux-perf-5.10 \ - ncurses-dev \ - sphinx-doc \ - unzip \ - uuid-dev \ - && \ - rm -f /etc/apt/sources.list.d/debian.list && \ - rm -f /etc/apt/sources.list.d/stx.list && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - # Enable stx repo only. Packages installs below this point will use # only the managed locally-built & 3rd-party repos. RUN set -ex && \ @@ -63,23 +37,33 @@ RUN set -ex && \ apt-get update -y && \ apt-get upgrade -y && \ apt-get install -y \ + autoconf-archive \ + autogen \ automake \ bash \ bc \ bison \ + cmake \ curl \ + doxygen \ + dwarves \ fakeroot \ flex \ - gcc \ g++ \ + gcc \ + genisoimage \ gettext \ isomd5sum \ + kmod \ + libcap-dev \ libelf-dev \ + libncurses-dev \ libhwloc-dev=1.11.12-3 \ + libjson-c-dev \ libssl-dev \ linux-headers-5.10.0-6 \ + linux-perf-5.10 \ make \ - mkisofs \ pciutils \ python-is-python3 \ python3-intelhex \ @@ -88,8 +72,10 @@ RUN set -ex && \ python3-yaml \ rsync \ sphinx-common \ + sphinx-doc \ sudo \ sysvinit-utils \ + uuid-dev \ vim \ wget \ xz-utils \ @@ -105,6 +91,8 @@ RUN set -ex && \ acpica-tools \ dmidecode \ ethtool \ + git \ + git-review \ iproute2 \ linux-cpupower \ net-tools \ @@ -113,6 +101,8 @@ RUN set -ex && \ python3-opae.admin python3-opae.pacsign \ tcpdump \ trace-cmd \ + tree \ + unzip \ && \ apt-get clean && \ rm -rf /var/lib/apt/lists/*