mirror of
https://github.com/vyos/vyos-build.git
synced 2025-10-01 20:28:40 +02:00
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.
This commit is contained in:
parent
a2fb862fea
commit
844cac86fd
@ -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 ../
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user