diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-09-12 21:11:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-12 21:11:37 +0200 |
| commit | b9211e99fe914f666b94b37dae5d5a318f55677a (patch) | |
| tree | 60dae4f67febb1b4a77725b3fd90c8e73b70d993 | |
| parent | 917325fafc9365a722235222f8635653079a5854 (diff) | |
| parent | bf63918f9c6ab31585093e8c43900823e00f03c6 (diff) | |
| download | vyos-build-b9211e99fe914f666b94b37dae5d5a318f55677a.tar.gz vyos-build-b9211e99fe914f666b94b37dae5d5a318f55677a.zip | |
Merge pull request #760 from vyos/mergify/bp/circinus/pr-759
T6674: Fix build package netfilter dependencies (backport #759)
| -rw-r--r-- | scripts/package-build/netfilter/.gitignore | 5 | ||||
| -rw-r--r-- | 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 8518afb9..9bf39f82 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 45752d08..a39ba8b7 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 +""" |