From e14c56d886aa6a6f0e9f4ad615ad7a7cee52de7f Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 28 Nov 2024 12:07:39 +0000 Subject: T6912: Fix build dropbear dependency Use the global dependency instead of package dependency in the package.toml The package dependency is not used This fixes to build 'dropbear' package --- scripts/package-build/dropbear/.gitignore | 2 +- scripts/package-build/dropbear/package.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/package-build/dropbear/.gitignore b/scripts/package-build/dropbear/.gitignore index 6e8cff9c..3d080d7c 100644 --- a/scripts/package-build/dropbear/.gitignore +++ b/scripts/package-build/dropbear/.gitignore @@ -4,4 +4,4 @@ dropbear/ *.changes *.deb *.dsc - +*.tar.gz diff --git a/scripts/package-build/dropbear/package.toml b/scripts/package-build/dropbear/package.toml index cbb885ee..a00aad3d 100644 --- a/scripts/package-build/dropbear/package.toml +++ b/scripts/package-build/dropbear/package.toml @@ -3,5 +3,5 @@ name = "dropbear" commit_id = "debian/2022.83-1+deb12u1" scm_url = "https://salsa.debian.org/debian/dropbear.git" -[packages.dependencies] -packages = ["libpam0g-dev"] \ No newline at end of file +[dependencies] +packages = ["libpam0g-dev"] -- cgit v1.2.3 From 19bd06b0fed78599cfa81b76722099cad43de995 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 28 Nov 2024 12:19:16 +0000 Subject: T6912: Fix build strongswan dependency Use the global dependency instead of package dependency in the package.toml This fixes to build 'strongswan' package --- scripts/package-build/strongswan/.gitignore | 1 + scripts/package-build/strongswan/package.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/package-build/strongswan/.gitignore b/scripts/package-build/strongswan/.gitignore index ec612740..f1ad761d 100644 --- a/scripts/package-build/strongswan/.gitignore +++ b/scripts/package-build/strongswan/.gitignore @@ -4,3 +4,4 @@ strongswan/ *.changes *.deb *.dsc +*.tar.gz diff --git a/scripts/package-build/strongswan/package.toml b/scripts/package-build/strongswan/package.toml index 8cedd4ac..a5722062 100644 --- a/scripts/package-build/strongswan/package.toml +++ b/scripts/package-build/strongswan/package.toml @@ -13,7 +13,7 @@ dpkg-buildpackage -uc -us -tc -b -d cd ..; ./build-vici.sh """ -[packages.dependencies] +[dependencies] packages = [ "bison", "bzip2", -- cgit v1.2.3 From c193623120a74c02398843d386ebbd4af4efc181 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 28 Nov 2024 12:26:00 +0000 Subject: T6912: Fix build waagent dependency Use the global dependency instead of package dependency in the package.toml --- scripts/package-build/waagent/package.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package-build/waagent/package.toml b/scripts/package-build/waagent/package.toml index d7343a7a..1a382baa 100644 --- a/scripts/package-build/waagent/package.toml +++ b/scripts/package-build/waagent/package.toml @@ -3,5 +3,5 @@ name = "waagent" commit_id = "debian/2.9.1.1-2" scm_url = "https://salsa.debian.org/cloud-team/waagent.git" -[packages.dependencies] +[dependencies] packages = ["dpkg-source-gitarchive"] -- cgit v1.2.3 From 213d3244128fe73abffb5afbbd9abe3744843c14 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 28 Nov 2024 12:29:43 +0000 Subject: T6912: Fix hsflowd dependency Use the global dependency instead of package dependency in the package.toml This fixes to build 'hsflowd' package --- scripts/package-build/hsflowd/.gitignore | 1 + scripts/package-build/hsflowd/package.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/package-build/hsflowd/.gitignore b/scripts/package-build/hsflowd/.gitignore index d0964b29..ecb384cd 100644 --- a/scripts/package-build/hsflowd/.gitignore +++ b/scripts/package-build/hsflowd/.gitignore @@ -4,3 +4,4 @@ host-sflow/ *.changes *.deb *.dsc +*.tar.gz diff --git a/scripts/package-build/hsflowd/package.toml b/scripts/package-build/hsflowd/package.toml index 75d320a7..8418319e 100644 --- a/scripts/package-build/hsflowd/package.toml +++ b/scripts/package-build/hsflowd/package.toml @@ -4,5 +4,5 @@ commit_id = "v2.0.55-1" scm_url = "https://github.com/sflow/host-sflow.git" build_cmd = "make deb FEATURES='PCAP DROPMON DBUS'" -[packages.dependencies] +[dependencies] packages = ["libpcap0.8-dev"] -- cgit v1.2.3 From bffc5c8c36fa74d14f6917bc0e0adc5d807947b2 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 28 Nov 2024 12:43:32 +0000 Subject: T6912: Fix build isc-dhcp dependency Use the global dependency instead of package dependency in the package.toml This fixes to build 'isc-dhcp' package --- scripts/package-build/isc-dhcp/.gitignore | 2 +- scripts/package-build/isc-dhcp/package.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package-build/isc-dhcp/.gitignore b/scripts/package-build/isc-dhcp/.gitignore index 66d17cc8..3f2ca44a 100644 --- a/scripts/package-build/isc-dhcp/.gitignore +++ b/scripts/package-build/isc-dhcp/.gitignore @@ -4,4 +4,4 @@ isc-dhcp/ *.changes *.deb *.dsc - +*.tar.gz diff --git a/scripts/package-build/isc-dhcp/package.toml b/scripts/package-build/isc-dhcp/package.toml index 76a0e4a1..f07e71e3 100644 --- a/scripts/package-build/isc-dhcp/package.toml +++ b/scripts/package-build/isc-dhcp/package.toml @@ -3,5 +3,5 @@ name = "isc-dhcp" commit_id = "debian/4.4.3-P1-4" scm_url = "https://salsa.debian.org/debian/isc-dhcp" -[packages.dependencies] +[dependencies] packages = ["libpam0g-dev"] -- cgit v1.2.3 From d4b572844d4c05f9c3ef8a06e463a4fa35a678c1 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Thu, 28 Nov 2024 12:53:15 +0000 Subject: T6912: Fix build podman dependency Use the global dependency instead of package dependency in the package.toml This fixes to build 'podman' package --- scripts/package-build/podman/package.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package-build/podman/package.toml b/scripts/package-build/podman/package.toml index 952af518..707f3d7e 100644 --- a/scripts/package-build/podman/package.toml +++ b/scripts/package-build/podman/package.toml @@ -20,7 +20,7 @@ fpm --input-type dir --output-type deb --name podman \ --license "Apache License 2.0" -C podman-v$VERSION --package .. """ -[packages.dependencies] +[dependencies] packages = [ "libseccomp-dev", "libgpgme-dev" -- cgit v1.2.3