sonic-platform-vpp trixie migration.

azure-pipelines.yml

@@ -26,7 +26,7 @@ schedules:
 parameters:
   - name: debian_version
     type: string
-    default: bookworm
+    default: trixie
   - name: arch
     type: string
     default: amd64

docker-gbsyncd-vpp/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 

docker-sonic-vpp/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-swss-layer-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 

docker-sonic-vpp/conf/startup.conf.tmpl

@@ -244,6 +244,7 @@ plugins {
 	## Disable all plugins by default and then selectively enable specific plugins
 	plugin default { disable }
 	plugin af_packet_plugin.so { enable }
+	plugin tap_plugin.so { enable }
 	plugin dpdk_plugin.so { enable }
 	plugin linux_cp_plugin.so { enable }
 	plugin linux_nl_plugin.so { enable }

docker-syncd-vpp/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-trixie-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 

docker-syncd-vpp/conf/startup.conf.tmpl

@@ -232,6 +232,7 @@ plugins {
 	## Disable all plugins by default and then selectively enable specific plugins
 	plugin default { disable }
 	plugin af_packet_plugin.so { enable }
+	plugin tap_plugin.so { enable }
 	plugin dpdk_plugin.so { enable }
 	plugin linux_cp_plugin.so { enable }
 	plugin linux_nl_plugin.so { enable }

rules/docker-gbsyncd-vpp.mk

@@ -15,7 +15,7 @@
 # docker image for vpp gbsyncd
 
 DOCKER_GBSYNCD_PLATFORM_CODE = vpp
-include $(PLATFORM_PATH)/../template/docker-gbsyncd-bookworm.mk
+include $(PLATFORM_PATH)/../template/docker-gbsyncd-trixie.mk
 
 $(DOCKER_GBSYNCD_BASE)_DEPENDS += $(LIBSAIVS) \
                                 $(SYNCD_VS)
@@ -28,5 +28,3 @@ $(DOCKER_GBSYNCD_BASE)_DBG_DEPENDS += $(SYNCD_VS_DBG) \
 
 $(DOCKER_GBSYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_GBSYNCD_BASE)_PACKAGE_NAME = gbsyncd
-
-$(DOCKER_GBSYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot

rules/docker-sonic-vpp.mk

@@ -57,7 +57,7 @@ $(DOCKER_SONIC_VPP)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
                             $(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
                             $(COPP_CONFIG_TEMPLATE)
 
-$(DOCKER_SONIC_VPP)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
+$(DOCKER_SONIC_VPP)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_TRIXIE)
 SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VPP)
 
-SONIC_BOOKWORM_DOCKERS += $(DOCKER_SONIC_VPP)
+SONIC_TRIXIE_DOCKERS += $(DOCKER_SONIC_VPP)

rules/docker-syncd-vpp.mk

@@ -28,7 +28,7 @@
 # docker image for vpp syncd
 
 DOCKER_SYNCD_PLATFORM_CODE = vpp
-include $(PLATFORM_PATH)/../template/docker-syncd-bookworm.mk
+include $(PLATFORM_PATH)/../template/docker-syncd-trixie.mk
 
 $(DOCKER_SYNCD_BASE)_DEPENDS += $(LIBSAIVS) \
                                 $(SYNCD_VS)

rules/vpp.mk

@@ -1,13 +1,13 @@
 # libvpp package
 
-VPP_VERSION_BASE = 2510
+VPP_VERSION_BASE = 2606
 # Bump the minor suffix whenever vppbld/patches/series or any patch file
 # under vppbld/patches/*.patch changes content. The VPP_VERSION_SONIC string
 # is the cache key used by vppbld/Makefile to fetch pre-built debs from
 # https://packages.buildkite.com/sonic-vpp/vpp; if the suffix isn't bumped,
 # downstream sonic-buildimage builds will silently pull stale debs that
 # pre-date the new patch series and end up with VPP/SAI CRC drift.
-VPP_VERSION = $(VPP_VERSION_BASE)-0.4
+VPP_VERSION = $(VPP_VERSION_BASE)-0.2
 VPP_VERSION_SONIC = $(VPP_VERSION)+b1sonic1
 VPP_SRC_PATH = platform/vpp/vppbld
 
@@ -17,7 +17,9 @@ export VPP_SRC_PATH
 VPPINFRA = libvppinfra_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb
 $(VPPINFRA)_SRC_PATH = $(VPP_SRC_PATH)
 $(VPPINFRA)_DEPENDS += $(LIBNL3) $(LIBNL3_DEV) $(LIBNL_ROUTE3) $(LIBNL_ROUTE3_DEV)
+ifeq ($(BLDENV),trixie)
 SONIC_MAKE_DEBS += $(VPPINFRA)
+endif
 
 VPP_MAIN = vpp_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb
 $(VPP_MAIN)_DEPENDS += $(VPPINFRA)
@@ -56,9 +58,11 @@ VPPDBG = vpp-dbg_$(VPP_VERSION_SONIC)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(VPPINFRA),$(VPPDBG)))
 
 # Add VPP build/runtime dependencies to sairedis packages
+ifeq ($(BLDENV),trixie)
 $(LIBSAIREDIS)_DEPENDS += $(VPP_MAIN) $(VPP_PLUGIN_CORE) $(VPP_PLUGIN_DPDK) \
 	$(VPP_PLUGIN_DEV) $(VPP_DEV) $(VPPINFRA_DEV) $(VPPDBG)
 $(LIBSAIVS)_RDEPENDS += $(VPP_MAIN) $(VPP_PLUGIN_CORE) $(VPP_PLUGIN_DPDK)
+endif
 
 VPP_VERSION_FILE = vpp_$(VPP_VERSION_SONIC)_commit
 

vppbld/patches/0001-remove-libnl-and-tshark-dependencies.patch

@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 593ea4e98..736fb6704 100644
+index daede502e..6b5d29557 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -104,7 +104,7 @@ DEB_DEPENDS += python3-ply libunwind-dev

vppbld/patches/0002-xdp-tools-force-subdir-libbpf.patch

@@ -1,13 +1,13 @@
 diff --git a/build/external/packages/xdp-tools.mk b/build/external/packages/xdp-tools.mk
-index a692aacf1..0265b8eaf 100644
+index f33c220e5..fad06266a 100644
 --- a/build/external/packages/xdp-tools.mk
 +++ b/build/external/packages/xdp-tools.mk
 @@ -25,7 +25,7 @@ define  xdp-tools_config_cmds
  endef
 
  define  xdp-tools_build_cmds
--	@cd ${xdp-tools_src_dir} && $(MAKE) CC=gcc V=1 BUILD_STATIC_ONLY=y PREFIX='$(xdp-tools_install_dir)' > $(xdp-tools_build_log)
-+	@cd ${xdp-tools_src_dir} && $(MAKE) CC=gcc FORCE_SUBDIR_LIBBPF=1 V=1 BUILD_STATIC_ONLY=y PREFIX='$(xdp-tools_install_dir)' > $(xdp-tools_build_log)
+-	@cd ${xdp-tools_src_dir} && $(MAKE) CC=gcc V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log)
++	@cd ${xdp-tools_src_dir} && $(MAKE) CC=gcc FORCE_SUBDIR_LIBBPF=1 V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log)
  endef
 
  define  xdp-tools_install_cmds

vppbld/patches/0003-vxlan-export-vxlan_main-symbol.patch

@@ -1,8 +1,8 @@
 diff --git a/src/plugins/vxlan/vxlan.c b/src/plugins/vxlan/vxlan.c
-index 0885550d2..8b8cd66e4 100644
+index 46c014912..523e7b72d 100644
 --- a/src/plugins/vxlan/vxlan.c
 +++ b/src/plugins/vxlan/vxlan.c
-@@ -43,7 +43,7 @@
+@@ -34,7 +34,7 @@
   */