From 64b545fa7c098151cb2db5501254349c18a117b9 Mon Sep 17 00:00:00 2001 From: Dongqi Chen Date: Wed, 16 Sep 2020 10:48:57 +0800 Subject: [PATCH] Remove kernel and kernel-rt extra modules pkgs in the kickstarts We are now including those packages in the image (see the other commit connected to this bug) so need to exclude them from the kickstarts. Change-Id: I7de98e859ada23153dde7a49528ad66943aa34c7 Partial-Bug: 1894171 Signed-off-by: Dongqi Chen (cherry picked from commit 8a6d2c542bf667ee489d370dd8b73fbbfeaedb10) --- bsp-files/filter_out_from_controller | 1 + bsp-files/filter_out_from_smallsystem | 1 + bsp-files/filter_out_from_smallsystem_lowlatency | 1 + bsp-files/filter_out_from_storage | 1 + bsp-files/filter_out_from_worker | 1 + bsp-files/filter_out_from_worker_lowlatency | 1 + bsp-files/kickstarts/pre_pkglist.cfg | 1 + bsp-files/kickstarts/pre_pkglist_lowlatency.cfg | 1 + 8 files changed, 8 insertions(+) diff --git a/bsp-files/filter_out_from_controller b/bsp-files/filter_out_from_controller index 0dd8fd4a..d0f2c5bf 100644 --- a/bsp-files/filter_out_from_controller +++ b/bsp-files/filter_out_from_controller @@ -29,6 +29,7 @@ kernel-rt kernel-module-igb-uio kernel-module-igb-uio-rt kernel-rt-kvm +kernel-rt-modules-extra kmod-e1000e-rt kmod-i40e-rt kmod-iavf-rt diff --git a/bsp-files/filter_out_from_smallsystem b/bsp-files/filter_out_from_smallsystem index cd0fe150..53d70456 100644 --- a/bsp-files/filter_out_from_smallsystem +++ b/bsp-files/filter_out_from_smallsystem @@ -9,6 +9,7 @@ nfscheck kernel-rt kernel-module-igb-uio-rt kernel-rt-kvm +kernel-rt-modules-extra kmod-e1000e-rt kmod-i40e-rt kmod-iavf-rt diff --git a/bsp-files/filter_out_from_smallsystem_lowlatency b/bsp-files/filter_out_from_smallsystem_lowlatency index 6ef074fc..63952b03 100644 --- a/bsp-files/filter_out_from_smallsystem_lowlatency +++ b/bsp-files/filter_out_from_smallsystem_lowlatency @@ -22,3 +22,4 @@ qat17 kernel-tools kernel-tools-libs kmod-drbd +kernel-modules-extra diff --git a/bsp-files/filter_out_from_storage b/bsp-files/filter_out_from_storage index 128d0582..476ec5ff 100644 --- a/bsp-files/filter_out_from_storage +++ b/bsp-files/filter_out_from_storage @@ -286,6 +286,7 @@ kernel-rt kernel-module-igb-uio kernel-module-igb-uio-rt kernel-rt-kvm +kernel-rt-modules-extra kmod-e1000e-rt kmod-i40e-rt kmod-iavf-rt diff --git a/bsp-files/filter_out_from_worker b/bsp-files/filter_out_from_worker index 35d510e7..fbe6ba25 100644 --- a/bsp-files/filter_out_from_worker +++ b/bsp-files/filter_out_from_worker @@ -254,6 +254,7 @@ python-django-horizon kernel-rt kernel-module-igb-uio-rt kernel-rt-kvm +kernel-rt-modules-extra kmod-e1000e-rt kmod-i40e-rt kmod-iavf-rt diff --git a/bsp-files/filter_out_from_worker_lowlatency b/bsp-files/filter_out_from_worker_lowlatency index bf81b1a3..e316bf83 100644 --- a/bsp-files/filter_out_from_worker_lowlatency +++ b/bsp-files/filter_out_from_worker_lowlatency @@ -271,6 +271,7 @@ mlnx-ofa_kernel-modules qat17 kernel-tools kernel-tools-libs +kernel-modules-extra NaviCLI-Linux-64-x86-en_US kmod-drbd-rt snmp-audittrail diff --git a/bsp-files/kickstarts/pre_pkglist.cfg b/bsp-files/kickstarts/pre_pkglist.cfg index 37fe0239..4653e747 100644 --- a/bsp-files/kickstarts/pre_pkglist.cfg +++ b/bsp-files/kickstarts/pre_pkglist.cfg @@ -5,6 +5,7 @@ -kernel-module-wrs-avp-rt -kernel-rt -kernel-rt-kvm +-kernel-rt-modules-extra -kernel-rt-tools -kernel-rt-tools-libs -kmod-drbd-rt diff --git a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg index 3af6a396..a6e6f149 100644 --- a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg +++ b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg @@ -4,6 +4,7 @@ -kernel-module-igb-uio -kernel-module-wrs-avp -kernel +-kernel-modules-extra -kernel-tools -kernel-tools-libs -kmod-drbd