From 3ab2a5925ed3a4037c4a1aca77ab17e8791e2bea Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 30 Oct 2021 09:05:54 -0700 Subject: [PATCH] Update runtime-install/cleanup for Marvell Prestera fw split Marvell Prestera firmware has been split into its own subpackage, so instead of stripping the files from linux-firmware, exclude the package from the globed install command. Signed-off-by: Adam Williamson (cherry picked from commit 5286e4d917315de53b490e38ff93e00c84511d29) --- share/templates.d/99-generic/runtime-cleanup.tmpl | 1 - share/templates.d/99-generic/runtime-install.tmpl | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl index 827465f0..5960c82b 100644 --- a/share/templates.d/99-generic/runtime-cleanup.tmpl +++ b/share/templates.d/99-generic/runtime-cleanup.tmpl @@ -236,7 +236,6 @@ removefrom linux-firmware /usr/lib/firmware/qcom/sm8250/* removefrom linux-firmware /usr/lib/firmware/qcom/venus*/* removefrom linux-firmware /usr/lib/firmware/meson/vdec/* removefrom linux-firmware /usr/lib/firmware/mellanox/mlxsw_spectrum* -removefrom linux-firmware /usr/lib/firmware/mrvl/prestera/* %if basearch != "aarch64": removefrom linux-firmware /usr/lib/firmware/dpaa2/* %endif diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl index fddac051..fd186193 100644 --- a/share/templates.d/99-generic/runtime-install.tmpl +++ b/share/templates.d/99-generic/runtime-install.tmpl @@ -26,7 +26,8 @@ installpkg grubby --except cx18-firmware --except iscan-firmware \ --except uhd-firmware --except lulzbot-marlin-firmware \ --except gnome-firmware --except sigrok-firmware \ - --except liquidio-firmware --except netronome-firmware + --except liquidio-firmware --except netronome-firmware \ + --except mrvlprestera-firmware installpkg b43-openfwwf %endif