changes for updating the vpp release to 202510 (#206)

* changes for updating the vpp release to 202510

* address the PR comments

Author: aronovic

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

@@ -77,6 +77,7 @@ cpu {
 	## Set logical CPU core where main thread runs, if main core is not set
 	## VPP will use core 1 if available
 	# main-core 1
+    main-core 2
 
 	## Set logical CPU core(s) where worker threads are running
 	# corelist-workers 2-3,18-19

vppbld/Makefile

@@ -53,7 +53,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)):
 
 build_locally: repo_clone
 	pushd $(VPP_REPO_DIR)
-	make UNATTENDED=y PLATFORM=vpp install-dep && CUSTOM_VERSION=$(VPP_VERSION_SONIC) make UNATTENDED=y PLATFORM=vpp -j4 pkg-deb
+	make UNATTENDED=y PLATFORM=vpp DPDK_MLX4_PMD=n DPDK_MLX5_PMD=n DPDK_MLX5_COMMON_PMD=n install-dep && make PLATFORM=vpp DPDK_MLX4_PMD=n DPDK_MLX5_PMD=n DPDK_MLX5_COMMON_PMD=n install-ext-deps && CUSTOM_VERSION=$(VPP_VERSION_SONIC) make UNATTENDED=y PLATFORM=vpp -j4 DPDK_MLX4_PMD=n DPDK_MLX5_PMD=n DPDK_MLX5_COMMON_PMD=n pkg-deb
 	pushd build-root
 	@for target in *_$(CONFIGURED_ARCH).deb; do \
 		cp $$target $(DEST)/

vppbld/vpp.patch

@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 6bd4ab611..128b462e5 100644
+index 593ea4e98..736fb6704 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -96,7 +96,7 @@ DEB_DEPENDS += libffi-dev python3-ply libunwind-dev
+@@ -104,7 +104,7 @@ DEB_DEPENDS += python3-ply libunwind-dev
  DEB_DEPENDS += cmake ninja-build python3-jsonschema python3-yaml
  DEB_DEPENDS += python3-venv  # ensurepip
  DEB_DEPENDS += python3-dev python3-pip
@@ -11,25 +11,25 @@ index 6bd4ab611..128b462e5 100644
  # DEB_DEPENDS += enchant  # for docs
  DEB_DEPENDS += python3-virtualenv
  DEB_DEPENDS += libssl-dev
-@@ -105,7 +105,7 @@ DEB_DEPENDS += iperf3 # for 'make test TEST=vcl'
- DEB_DEPENDS += nasm
+@@ -112,7 +112,7 @@ DEB_DEPENDS += libelf-dev libpcap-dev # for libxdp (af_xdp)
+ DEB_DEPENDS += iperf3 # for 'make test TEST=vcl'
  DEB_DEPENDS += iperf ethtool  # for 'make test TEST=vm_vpp_interfaces'
  DEB_DEPENDS += libpcap-dev
 -DEB_DEPENDS += tshark
 +#DEB_DEPENDS += tshark
  DEB_DEPENDS += jq # for extracting test summary from .json report (hs-test)
- 
- LIBFFI=libffi6 # works on all but 20.04 and debian-testing
+ DEB_DEPENDS += libiberty-dev
+ DEB_DEPENDS += nasm libnuma-dev # for make-ext-deps
 diff --git a/build/external/packages/xdp-tools.mk b/build/external/packages/xdp-tools.mk
-index 57f5e0ae8..73e35b90b 100644
+index a692aacf1..0265b8eaf 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 > $(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)
+-	@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)
  endef
 
  define  xdp-tools_install_cmds

vppbld/vpp_version

@@ -1 +1 @@
-9543e29708524accce591eab3aa23270ab44ae1a
+435fda042e68ef90734ef5b3530c0a5b911a3bf8