From 199198fc97e2d5e5f0928cb3c1433e99dfa7437c Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Fri, 17 Jun 2022 13:07:53 -0400 Subject: [PATCH] Debian: ice: Restore OS default DDP firmware Port commit d9bb55fd5d41c7f7c897dd731d371735cc293786 to debian, its review is at: https://review.opendev.org/c/starlingx/kernel/+/846181 Straightforward, nothing needed any major change. Verification: - both ice-common and ice packages build successfully - ice-common now contains both the regular ddp firmware and the comms ddp firware - stx-ice.pkg symlink now points at the regular ddp fw Closes-Bug: 1978883 Change-Id: I946a6447a70628a3e9f5f967e5c496849582ce71 Signed-off-by: Jim Somerville --- kernel-modules/intel-ice/debian/deb_folder/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel-modules/intel-ice/debian/deb_folder/rules b/kernel-modules/intel-ice/debian/deb_folder/rules index cbe6eeb8..5b6a6bd7 100755 --- a/kernel-modules/intel-ice/debian/deb_folder/rules +++ b/kernel-modules/intel-ice/debian/deb_folder/rules @@ -52,11 +52,16 @@ override_dh_auto_install: dh_install -p$(pkg_common_name) README $(_defaultdocdir)/kmod-$(kmod_name)-$(version)/ dh_install -p$(pkg_common_name) $(kmod_name).7 $(_mandir)/man7/ dh_install -p$(pkg_common_name) debian/extra/ice.conf $(_sysconfdir)/modules-load.d/ + # Install both the OS default regular DDP fw and the COMMS version dh_installdirs -p$(pkg_common_name) /lib/firmware/updates/intel/ice/ddp/ + install -m 644 ddp/README debian/$(pkg_common_name)/lib/firmware/updates/intel/ice/ddp/ + install -m 644 ddp/LICENSE debian/$(pkg_common_name)/lib/firmware/updates/intel/ice/ddp/ + install -m 644 ddp/ice-*.pkg debian/$(pkg_common_name)/lib/firmware/updates/intel/ice/ddp/ install -m644 ice_comms/*.txt debian/$(pkg_common_name)/lib/firmware/updates/intel/ice/ddp/ install -m644 ice_comms/ice_comms*.pkg debian/$(pkg_common_name)/lib/firmware/updates/intel/ice/ddp/ + # Make the regular DDP fw be the default one to load dh_installdirs -p$(pkg_common_name) /lib/firmware/intel/ice/ddp/ - ln -frs debian/$(pkg_common_name)/lib/firmware/updates/intel/ice/ddp/ice_comms*.pkg debian/$(pkg_common_name)/lib/firmware/intel/ice/ddp/stx-ice.pkg + ln -frs debian/$(pkg_common_name)/lib/firmware/updates/intel/ice/ddp/ice-*.pkg debian/$(pkg_common_name)/lib/firmware/intel/ice/ddp/stx-ice.pkg override_dh_strip: dh_strip