From d83d260aeb4c64b057ab08811d5511667fa44ae2 Mon Sep 17 00:00:00 2001 From: "M. Vefa Bicakci" Date: Thu, 10 Feb 2022 20:17:57 -0500 Subject: [PATCH] Filter out kmod-bnxt_en{,-rt} as necessary This commit ensures that the kmod-bnxt_en package is not installed when in the low-latency profile, and that the kmod-bnxt_en-rt package is not installed when in the standard/non-low-latency profile. This is achieved by adding the kmod-bnxt_en and kmod-bnxt_en-rt packages to the filter_out_from_* and pre_pkglist* files as required. Testing: - An ISO image can be built using a monolithic build procedure. - Installation of the ISO image is successful with standard and low-latency profiles. - The kmod-bnxt_en package is only installed with standard profile, whereas the kmod-bnxt_en-rt package is only installed with low-latency profile. Story: 2009915 Task: 44792 Depends-On: https://review.opendev.org/c/starlingx/kernel/+/833464 Change-Id: I7a5c6086183d6b04e587192012f37aa7d0a2c2b3 Signed-off-by: M. Vefa Bicakci --- 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 + bsp-files/kickstarts/pre_pkglist_prestage.cfg | 1 + 9 files changed, 9 insertions(+) diff --git a/bsp-files/filter_out_from_controller b/bsp-files/filter_out_from_controller index bd5c4604..ed94c86c 100644 --- a/bsp-files/filter_out_from_controller +++ b/bsp-files/filter_out_from_controller @@ -31,6 +31,7 @@ kernel-module-igb-uio kernel-module-igb-uio-rt kernel-rt-kvm kernel-rt-modules-extra +kmod-bnxt_en-rt 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 eb76b6fc..2ca4c010 100644 --- a/bsp-files/filter_out_from_smallsystem +++ b/bsp-files/filter_out_from_smallsystem @@ -12,6 +12,7 @@ kernel-rt kernel-module-igb-uio-rt kernel-rt-kvm kernel-rt-modules-extra +kmod-bnxt_en-rt 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 546a4586..e8302fe9 100644 --- a/bsp-files/filter_out_from_smallsystem_lowlatency +++ b/bsp-files/filter_out_from_smallsystem_lowlatency @@ -10,6 +10,7 @@ storageconfig nfscheck kernel kernel-module-igb-uio +kmod-bnxt_en kmod-e1000e kmod-i40e kmod-iavf diff --git a/bsp-files/filter_out_from_storage b/bsp-files/filter_out_from_storage index 0cc96bc6..6b0eb371 100644 --- a/bsp-files/filter_out_from_storage +++ b/bsp-files/filter_out_from_storage @@ -283,6 +283,7 @@ kernel-module-igb-uio kernel-module-igb-uio-rt kernel-rt-kvm kernel-rt-modules-extra +kmod-bnxt_en-rt 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 07496649..5f38978d 100644 --- a/bsp-files/filter_out_from_worker +++ b/bsp-files/filter_out_from_worker @@ -250,6 +250,7 @@ kernel-rt kernel-module-igb-uio-rt kernel-rt-kvm kernel-rt-modules-extra +kmod-bnxt_en-rt 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 6b556065..cb55a5ce 100644 --- a/bsp-files/filter_out_from_worker_lowlatency +++ b/bsp-files/filter_out_from_worker_lowlatency @@ -253,6 +253,7 @@ wrs-heat-templates python-django-horizon kernel kernel-module-igb-uio +kmod-bnxt_en kmod-e1000e kmod-i40e kmod-iavf diff --git a/bsp-files/kickstarts/pre_pkglist.cfg b/bsp-files/kickstarts/pre_pkglist.cfg index 4653e747..962d2ce3 100644 --- a/bsp-files/kickstarts/pre_pkglist.cfg +++ b/bsp-files/kickstarts/pre_pkglist.cfg @@ -8,6 +8,7 @@ -kernel-rt-modules-extra -kernel-rt-tools -kernel-rt-tools-libs +-kmod-bnxt_en-rt -kmod-drbd-rt -kmod-e1000e-rt -kmod-i40e-rt diff --git a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg index a6e6f149..c3ef40c0 100644 --- a/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg +++ b/bsp-files/kickstarts/pre_pkglist_lowlatency.cfg @@ -7,6 +7,7 @@ -kernel-modules-extra -kernel-tools -kernel-tools-libs +-kmod-bnxt_en -kmod-drbd -kmod-e1000e -kmod-i40e diff --git a/bsp-files/kickstarts/pre_pkglist_prestage.cfg b/bsp-files/kickstarts/pre_pkglist_prestage.cfg index e097ce32..25223c59 100644 --- a/bsp-files/kickstarts/pre_pkglist_prestage.cfg +++ b/bsp-files/kickstarts/pre_pkglist_prestage.cfg @@ -59,6 +59,7 @@ -kernel-rt-tools -kernel-rt-tools-libs -kexec-tools +-kmod-bnxt_en-rt -kmod-drbd-rt -kmod-e1000e-rt -kmod-i40e-rt