From d6134ebdaa58c09a819ec8f7128e9813d98db38a Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 13 Jan 2025 15:37:11 +0000 Subject: [PATCH] T7026: Use vpp patches during build as they not applied Patches for VPP are not applied due to specific to the vpp repo structure, so we cannot use standard included to build.py function 'apply_patches' to patch the vpp sources. Use explicit patch in the "build_cmd" as a workaround and the simplest fix. --- scripts/package-build/vpp/package.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/package-build/vpp/package.toml b/scripts/package-build/vpp/package.toml index 644b36a994..5b42801a41 100644 --- a/scripts/package-build/vpp/package.toml +++ b/scripts/package-build/vpp/package.toml @@ -15,6 +15,12 @@ rsync -av ../vyos-vpp-patches/patches/vpp/ ../patches/vpp/ """ build_cmd = """ +# Patches for vpp should applied here +for patch in ../patches/vpp/*.patch; do + echo "I: build_cmd Applying patch $patch..." + git -c user.email=maintainers@vyos.net -c user.name=vyos am "$patch" || { echo "Failed to apply patch $patch"; exit 1; } +done + make UNATTENDED=yes install-dep make pkg-deb cp build-root/*.deb ../