From 55e826a814aa8ed5c4424dea30e49db1fcea3f32 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Jan 10 2022 20:50:53 +0000 Subject: Exclude Marvell Prestera files from main package These were meant to be split into a subpackage, but we neglected to include a sed command to drop them from the main package file list, so they wound up in *both* the main package and the sub package. This should drop them from the main package. Signed-off-by: Adam Williamson --- diff --git a/linux-firmware.spec b/linux-firmware.spec index 3d5766c..b3144d1 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -1,5 +1,5 @@ %global debug_package %{nil} -%global firmware_release 127 +%global firmware_release 128 %global _firmwarepath /usr/lib/firmware %define _binaries_in_noarch_packages_terminate_build 0 @@ -335,6 +335,7 @@ sed -i -e '/^iwlwifi/d' \ -i -e '/^libertas\/sd8686/d' \ -i -e '/^libertas\/usb8388/d' \ -i -e '/^mrvl\/sd8787/d' \ + -i -e '/^mrvl\/prestera/d' \ -i -e '/^liquidio/d' \ -i -e '/^netronome/d' \ linux-firmware.files @@ -464,6 +465,9 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %{_firmwarepath}/mrvl/prestera/* %changelog +* Mon Jan 10 2022 Adam Williamson - 20211216-128 +- Don't put Prestera firmwares in main package as well as subpackage + * Thu Dec 16 2021 Peter Robinson - 20211216-127 - Update to upstream 20211216 release - Update AMD cpu microcode