From 2eb9deea6f211edb7e41f07f09a5a21ba0b7d0a9 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Fri, 10 Jan 2025 11:52:44 +0000 Subject: [PATCH] T7026: Use prebuild hook to build vpp --- scripts/package-build/vpp/.gitignore | 1 + scripts/package-build/vpp/package.toml | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/scripts/package-build/vpp/.gitignore b/scripts/package-build/vpp/.gitignore index 100411c469..387686755e 100644 --- a/scripts/package-build/vpp/.gitignore +++ b/scripts/package-build/vpp/.gitignore @@ -1 +1,2 @@ /vpp/ +/vyos-vpp-patches/ diff --git a/scripts/package-build/vpp/package.toml b/scripts/package-build/vpp/package.toml index 255c39432f..644b36a994 100644 --- a/scripts/package-build/vpp/package.toml +++ b/scripts/package-build/vpp/package.toml @@ -1,8 +1,19 @@ +[[packages]] +name = "vyos-vpp-patches" +commit_id = "current" +scm_url = "https://github.com/vyos/vyos-vpp-patches" +build_cmd = "/bin/true" + [[packages]] name = "vpp" commit_id = "stable/2406" scm_url = "https://github.com/FDio/vpp" +pre_build_hook = """ +mkdir -p ../patches/vpp/ +rsync -av ../vyos-vpp-patches/patches/vpp/ ../patches/vpp/ +""" + build_cmd = """ make UNATTENDED=yes install-dep make pkg-deb