From a8f9570038b6b3ad82148bd7307f03239a35ebb8 Mon Sep 17 00:00:00 2001 From: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> Date: Fri, 14 Aug 2026 08:13:25 +0000 Subject: [PATCH] [DO-NOT-MERGE][test] VPP: build sub-port fixes with VPP 0.5 Point src/sonic-sairedis at PR #1907 and platform/vpp at a branch based on current upstream master with VPP_VERSION bumped to 2606-0.5. The new package key forces buildimage to compile the current sonic_ext sources instead of downloading stale 2606-0.4 debs that predate the glean redirect and plugin API changes. Keep both submodule URLs on the lunyue-ms forks for this Elastictest-only image build. This commit must not be merged. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 232e6bef-2d69-47ff-9257-8f8ef3113bab Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> --- .gitmodules | 4 ++-- platform/vpp | 2 +- src/sonic-sairedis | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7a75dfb0711..0e866d641f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/sonic-net/sonic-linux-kernel [submodule "sonic-sairedis"] path = src/sonic-sairedis - url = https://github.com/sonic-net/sonic-sairedis + url = https://github.com/lunyue-ms/sonic-sairedis [submodule "sonic-swss"] path = src/sonic-swss url = https://github.com/sonic-net/sonic-swss @@ -128,7 +128,7 @@ url = https://github.com/Marvell-switching/sonic-platform-marvell.git [submodule "platform/vpp"] path = platform/vpp - url = https://github.com/sonic-net/sonic-platform-vpp.git + url = https://github.com/lunyue-ms/sonic-platform-vpp.git [submodule "platform/marvell-prestera/mrvl-prestera"] path = platform/marvell-prestera/mrvl-prestera url = https://github.com/Marvell-switching/mrvl-prestera.git diff --git a/platform/vpp b/platform/vpp index c8f82003a0a..100d39afbeb 160000 --- a/platform/vpp +++ b/platform/vpp @@ -1 +1 @@ -Subproject commit c8f82003a0ad835608c14ce249d29ec39578181b +Subproject commit 100d39afbeb56ffb9ec872481ddca0888df07034 diff --git a/src/sonic-sairedis b/src/sonic-sairedis index f0914e24404..537765268cc 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit f0914e2440415ebc46675d2b541b5ef4779b7459 +Subproject commit 537765268cc827497d7a6bdd2dec5c5253679104