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

T6912: Fix build dependency use global dependency
2025-10-01 20:28:40 +02:00 · 2024-11-28 16:34:59 +00:00 · 2024-11-28 16:34:59 +00:00 · c62fef71fc
commit c62fef71fc
parent 3e660d3e30 d4b572844d
10 changed files with 11 additions and 9 deletions
--- a/scripts/package-build/dropbear/.gitignore
+++ b/scripts/package-build/dropbear/.gitignore
@ -4,4 +4,4 @@ dropbear/
 *.changes
 *.deb
 *.dsc
-
+*.tar.gz
--- 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"]
+[dependencies]
+packages = ["libpam0g-dev"]
--- a/scripts/package-build/hsflowd/.gitignore
+++ b/scripts/package-build/hsflowd/.gitignore
@ -4,3 +4,4 @@ host-sflow/
 *.changes
 *.deb
 *.dsc
+*.tar.gz
--- 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"]
--- 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
--- 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"]
--- 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"
--- a/scripts/package-build/strongswan/.gitignore
+++ b/scripts/package-build/strongswan/.gitignore
@ -4,3 +4,4 @@ strongswan/
 *.changes
 *.deb
 *.dsc
+*.tar.gz
--- 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",
--- 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"]