From 844cac86fd0ba4b21e2a7544c06ce96622b47b80 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Mon, 13 Jan 2025 15:37:11 +0000 Subject: 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 | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'scripts/package-build') diff --git a/scripts/package-build/vpp/package.toml b/scripts/package-build/vpp/package.toml index 644b36a9..35a22896 100644 --- a/scripts/package-build/vpp/package.toml +++ b/scripts/package-build/vpp/package.toml @@ -3,11 +3,14 @@ name = "vyos-vpp-patches" commit_id = "current" scm_url = "https://github.com/vyos/vyos-vpp-patches" build_cmd = "/bin/true" +apply_patches = false [[packages]] name = "vpp" commit_id = "stable/2406" scm_url = "https://github.com/FDio/vpp" +# Skip apply patches by build.py as we use them in build_cmd +apply_patches = false pre_build_hook = """ mkdir -p ../patches/vpp/ @@ -15,6 +18,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 ../ -- cgit v1.2.3