Skip to content

Commit

Permalink
T7026: Use vpp patches during build as they not applied
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
sever-sever committed Jan 13, 2025
1 parent a2fb862 commit 7fbd401
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions scripts/package-build/vpp/package.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 apply "$patch" || { echo "Failed to apply patch $patch"; exit 1; }
done
make UNATTENDED=yes install-dep
make pkg-deb
cp build-root/*.deb ../
Expand Down

0 comments on commit 7fbd401

Please sign in to comment.