Merge pull request #848 from sever-sever/T6912-dropbear

T6912: Fix build dependency use global dependency

10 files changed, 11 insertions, 9 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"]
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"]
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"]
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"
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",
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"]