From bf63918f9c6ab31585093e8c43900823e00f03c6 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 12 Sep 2024 08:26:26 +0000 Subject: [PATCH] T6674: Fix build package netfilter dependencies (cherry picked from commit 21370c5c7dd396ae201c015cebf1c2816814aaa9) --- scripts/package-build/netfilter/.gitignore | 5 +++++ scripts/package-build/netfilter/package.toml | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/package-build/netfilter/.gitignore b/scripts/package-build/netfilter/.gitignore index 8518afb9a3..9bf39f8290 100644 --- a/scripts/package-build/netfilter/.gitignore +++ b/scripts/package-build/netfilter/.gitignore @@ -1,3 +1,8 @@ /pkg-libnftnl/ /pkg-nftables/ +*.buildinfo +*.build +*.changes +*.deb +*.dsc diff --git a/scripts/package-build/netfilter/package.toml b/scripts/package-build/netfilter/package.toml index 45752d084c..a39ba8b729 100644 --- a/scripts/package-build/netfilter/package.toml +++ b/scripts/package-build/netfilter/package.toml @@ -2,10 +2,14 @@ name = "pkg-libnftnl" commit_id = "debian/1.2.6-2" scm_url = "https://salsa.debian.org/pkg-netfilter-team/pkg-libnftnl.git" -build_cmd = "sudo mk-build-deps --install --tool 'apt-get --yes --no-install-recommends'; dpkg-buildpackage -uc -us -tc -b" [[packages]] name = "pkg-nftables" commit_id = "debian/1.0.9-1" scm_url = "https://salsa.debian.org/pkg-netfilter-team/pkg-nftables.git" -build_cmd = "sudo dpkg -i ../libnftnl*.deb; dpkg-buildpackage -uc -us -tc -b" + +build_cmd = """ +sudo dpkg -i ../libnftnl*.deb +sudo mk-build-deps --install --tool 'apt-get --yes --no-install-recommends' +dpkg-buildpackage -uc -us -tc -b +"""