460b13d3c3
Port commit 3b3e97366d5f22d0383792c089e24b199a7c70b1 to debian, its review is at: https://review.opendev.org/c/starlingx/kernel/+/837015 Straightforward, nothing needed adjustment for debian. Verification: - ice-common and ice packages successfully build - package contents are correct, and the stx-ice.pkg symlink is there and points to the firmware package - the driver's use of stx-ice.pkg has been well tested in CentOS already and there is no difference with Debian Story: 2010046 Task: 45451 Change-Id: I047afe533d143e86f26debc5aea5c215fae96ac0 Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From f4d74cf58d2285d8b3ee6ab5cff7c21e54518d3d Mon Sep 17 00:00:00 2001
|
|
Message-Id: <f4d74cf58d2285d8b3ee6ab5cff7c21e54518d3d.1655410427.git.Jim.Somerville@windriver.com>
|
|
From: Jackie Huang <jackie.huang@windriver.com>
|
|
Date: Fri, 20 May 2022 03:23:25 -0400
|
|
Subject: [PATCH] rename the ddp file to avoid conflict
|
|
|
|
Rename the ddp file to avoid conflict with the one
|
|
provided by linux-firmware.
|
|
|
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
src/ice_main.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/ice_main.c b/src/ice_main.c
|
|
index ca761bd..260cc03 100644
|
|
--- a/src/ice_main.c
|
|
+++ b/src/ice_main.c
|
|
@@ -47,7 +47,7 @@ static const char ice_copyright[] = "Copyright (C) 2018-2021, Intel Corporation.
|
|
#else /* UTS_UBUNTU_RELEASE_ABI */
|
|
#define ICE_DDP_PKG_PATH "intel/ice/ddp/"
|
|
#endif /* UTS_UBUNTU_RELEASE_ABI */
|
|
-#define ICE_DDP_PKG_FILE ICE_DDP_PKG_PATH "ice.pkg"
|
|
+#define ICE_DDP_PKG_FILE ICE_DDP_PKG_PATH "stx-ice.pkg"
|
|
|
|
MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
|
|
MODULE_DESCRIPTION(DRV_SUMMARY);
|
|
--
|
|
2.29.2
|
|
|