Merge pull request #759 from sever-sever/T6674-netfilter

T6674: Fix build package netfilter dependencies
vyos · Sep 12, 2024 · 300674c · 300674c
2 parents 55c17f9 + 21370c5
commit 300674c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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
+"""