diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2025-01-14 11:15:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-14 11:15:10 +0200 |
| commit | 4b9c86bd9aaafc987fa4a278c8c04c271c3e6e75 (patch) | |
| tree | b8b4a4d40a007c8b82e919e1d9932a921c0aeec4 /scripts/package-build/vpp | |
| parent | 0bd5cb4f5038f560d1b915ef5f62c14e0a9a10b3 (diff) | |
| parent | 0f44fc7abe063a4f64628404547801a089455154 (diff) | |
| download | vyos-build-4b9c86bd9aaafc987fa4a278c8c04c271c3e6e75.tar.gz vyos-build-4b9c86bd9aaafc987fa4a278c8c04c271c3e6e75.zip | |
Merge pull request #886 from sever-sever/T7026-fix-patches
T7026: Use vpp patches during build as they not applied
Diffstat (limited to 'scripts/package-build/vpp')
| -rw-r--r-- | scripts/package-build/vpp/package.toml | 9 |
1 files changed, 9 insertions, 0 deletions
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 ../ |