vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T7026: Use vpp patches during build as they not applied

Browse Source 
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.
This commit is contained in:
Viacheslav Hletenko 2025-01-13 15:37:11 +00:00
parent a2fb862fea
commit 844cac86fd
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/package-build/vpp/package.toml
View File

@ -3,11 +3,14 @@ name = "vyos-vpp-patches"
commit_id = "current" commit_id = "current"
scm_url = "https://github.com/vyos/vyos-vpp-patches" scm_url = "https://github.com/vyos/vyos-vpp-patches"
build_cmd = "/bin/true" build_cmd = "/bin/true"
apply_patches = false
[[packages]] [[packages]]
name = "vpp" name = "vpp"
commit_id = "stable/2406" commit_id = "stable/2406"
scm_url = "https://github.com/FDio/vpp" 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 = """ pre_build_hook = """
mkdir -p ../patches/vpp/ mkdir -p ../patches/vpp/
@ -15,6 +18,12 @@ rsync -av ../vyos-vpp-patches/patches/vpp/ ../patches/vpp/
""" """
build_cmd = """ 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 UNATTENDED=yes install-dep
make pkg-deb make pkg-deb
cp build-root/*.deb ../ cp build-root/*.deb ../