forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Mellanox] Upgrade syncd, syncd-rpc and saiserver to bookworm (sonic-…
…net#18651) - Why I did it Upgrade Mellanox (syncd/syncd-rpc/saiserver) containers to Bookworm - How to verify it Compile successfully and run sonic-mgmt tests Manual Verification and Regression tests Signed-off-by: Vivek Reddy Karri <[email protected]>
- Loading branch information
Showing
14 changed files
with
62 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,17 @@ | ||
From 28e58b34f1168de182c37eff640180b6064a800d Mon Sep 17 00:00:00 2001 | ||
From: liora <liora@nvidia.com> | ||
Date: Tue, 18 Apr 2023 13:01:16 +0000 | ||
Subject: [PATCH 1/1] Remove arpd from iproute2 package | ||
From 9b10f163354059a6b6cc2029ded5275f871f23e8 Mon Sep 17 00:00:00 2001 | ||
From: Vivek Reddy <vkarri@nvidia.com> | ||
Date: Fri, 26 Jan 2024 06:54:14 +0000 | ||
Subject: [PATCH 1/2] Remove arpd from iproute2 package | ||
|
||
Signed-off-by: Vivek Reddy <[email protected]> | ||
--- | ||
debian/control | 3 +-- | ||
debian/iproute2.install | 1 - | ||
misc/Makefile | 4 ---- | ||
3 files changed, 1 insertion(+), 7 deletions(-) | ||
|
||
diff --git a/debian/control b/debian/control | ||
index b5e8b0a..e735c26 100644 | ||
index f3a49a8..adc66c4 100644 | ||
--- a/debian/control | ||
+++ b/debian/control | ||
@@ -28,8 +28,7 @@ Build-Depends: bison, | ||
|
@@ -24,16 +25,16 @@ index b5e8b0a..e735c26 100644 | |
Depends: ${misc:Depends}, ${shlibs:Depends}, libcap2-bin, | ||
Recommends: ${ipmods:Recommends} | ||
diff --git a/debian/iproute2.install b/debian/iproute2.install | ||
index f9e8c26..fba201d 100644 | ||
index f93b273..b017b44 100644 | ||
--- a/debian/iproute2.install | ||
+++ b/debian/iproute2.install | ||
@@ -1,6 +1,5 @@ | ||
etc/ | ||
usr/include/iproute2/ | ||
-sbin/arpd /usr/sbin | ||
sbin/bridge | ||
sbin/dcb | ||
sbin/devlink | ||
sbin/genl /usr/sbin | ||
diff --git a/misc/Makefile b/misc/Makefile | ||
index 50dae79..1f3898f 100644 | ||
--- a/misc/Makefile | ||
|
@@ -50,5 +51,5 @@ index 50dae79..1f3898f 100644 | |
|
||
ss: $(SSOBJ) | ||
-- | ||
2.30.2 | ||
2.17.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
From 6676c4a200df54a06c96faa9a30baaefc61a91b5 Mon Sep 17 00:00:00 2001 | ||
From: liora <liora@nvidia.com> | ||
Date: Thu, 27 Apr 2023 03:34:10 +0000 | ||
Subject: [PATCH 1/1] Rename iproute2 debian package | ||
From e21c49764de5efc4b53685815837a74de37538f3 Mon Sep 17 00:00:00 2001 | ||
From: Vivek Reddy <vkarri@nvidia.com> | ||
Date: Fri, 26 Jan 2024 06:59:51 +0000 | ||
Subject: [PATCH 2/2] Rename iproute2 debian package | ||
|
||
Signed-off-by: Vivek Reddy <[email protected]> | ||
--- | ||
debian/control | 4 ++-- | ||
debian/{iproute2.install => iproute2-mlnx.install} | 0 | ||
|
@@ -11,7 +12,7 @@ Subject: [PATCH 1/1] Rename iproute2 debian package | |
rename debian/{iproute2.install => iproute2-mlnx.install} (100%) | ||
|
||
diff --git a/debian/control b/debian/control | ||
index e735c26..4b03a6f 100644 | ||
index adc66c4..0eb5988 100644 | ||
--- a/debian/control | ||
+++ b/debian/control | ||
@@ -25,11 +25,11 @@ Build-Depends: bison, | ||
|
@@ -27,24 +28,24 @@ index e735c26..4b03a6f 100644 | |
+Replaces: iproute, iproute2 | ||
Depends: ${misc:Depends}, ${shlibs:Depends}, libcap2-bin, | ||
Recommends: ${ipmods:Recommends} | ||
Suggests: iproute2-doc | ||
Suggests: iproute2-doc, python3:any | ||
diff --git a/debian/iproute2.install b/debian/iproute2-mlnx.install | ||
similarity index 100% | ||
rename from debian/iproute2.install | ||
rename to debian/iproute2-mlnx.install | ||
diff --git a/debian/rules b/debian/rules | ||
index d940d3c..8bd4f84 100755 | ||
index 4c93c86..4489d2c 100755 | ||
--- a/debian/rules | ||
+++ b/debian/rules | ||
@@ -34,7 +34,7 @@ override_dh_clean: | ||
@@ -33,7 +33,7 @@ execute_after_dh_clean: | ||
|
||
override_dh_shlibdeps: | ||
dh_shlibdeps -a -Xq_atm.so -Xm_xt.so -Xm_ipt.so | ||
- dh_shlibdeps -a -- -pipmods -dRecommends -e debian/iproute2/usr/lib/tc/m_xt.so -e debian/iproute2/usr/lib/tc/q_atm.so -xlibc6 | ||
+ dh_shlibdeps -a -- -pipmods -dRecommends -e debian/iproute2-mlnx/usr/lib/tc/m_xt.so -e debian/iproute2-mlnx/usr/lib/tc/q_atm.so -xlibc6 | ||
- dh_shlibdeps -a -- -pipmods -dRecommends -e debian/iproute2/usr/lib/$(DEB_HOST_MULTIARCH)/tc/m_xt.so -e debian/iproute2/usr/lib/$(DEB_HOST_MULTIARCH)/tc/q_atm.so -xlibc6 | ||
+ dh_shlibdeps -a -- -pipmods -dRecommends -e debian/iproute2-mlnx/usr/lib/$(DEB_HOST_MULTIARCH)/tc/m_xt.so -e debian/iproute2-mlnx/usr/lib/$(DEB_HOST_MULTIARCH)/tc/q_atm.so -xlibc6 | ||
|
||
override_dh_auto_test: | ||
# upstream test suite needs root and leaves machine unclean, skip it | ||
-- | ||
2.30.2 | ||
2.17.1 | ||
|
19 changes: 0 additions & 19 deletions
19
platform/mellanox/iproute2/patch/0003-Fix-version-identifier.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
0001-Remove-arpd-from-iproute2-package.patch | ||
0002-Rename-iproute2-debian-package.patch | ||
0003-Fix-version-identifier.patch | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters