Merge pull request bottlerocket-os#262 from bcressey/drop-deps-table

drop "dependencies" table for all packages
bcressey · Nov 19, 2024 · 2a75982 · 2a75982
2 parents 3e4cc8a + 429e6db
commit 2a75982
Show file tree

Hide file tree

Showing 30 changed files with 0 additions and 306 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/cni-plugins/Cargo.toml b/packages/cni-plugins/Cargo.toml
@@ -15,11 +15,5 @@ releases-url = "/~https://github.com/containernetworking/plugins/releases"
 url = "/~https://github.com/containernetworking/plugins/archive/v1.5.1/plugins-1.5.1.tar.gz"
 sha512 = "d2e01958dd8328407164cb6be9d962321742dae7011ce7cd7b2342f5e4b4bbcd992d8249c53d3d81250a60c27f049969bbf329a75440524f52c1f1466b6e7132"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-# `iptables` is only needed at runtime, and is pulled in by `release`.
-# iptables = { path = "../iptables" }
diff --git a/packages/cni/Cargo.toml b/packages/cni/Cargo.toml
@@ -16,11 +16,5 @@ url = "/~https://github.com/containernetworking/cni/archive/v1.2.3/cni-1.2.3.tar.g
 sha512 = "7df2a2d01b85ace4e73ea577017e7c98a5d3b86373da5cf9e4ec7f50a1439753ed447c8f7fc871876c624336d91848fd42f309481bffbccc388377dbfad2e133"
 bundle-modules = [ "go" ]
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-# `iptables` is only needed at runtime, and is pulled in by `release`.
-# iptables = { path = "../iptables" }
diff --git a/packages/containerd/Cargo.toml b/packages/containerd/Cargo.toml
@@ -15,11 +15,5 @@ releases-url = "/~https://github.com/containerd/containerd/releases"
 url = "/~https://github.com/containerd/containerd/archive/v1.7.22/containerd-1.7.22.tar.gz"
 sha512 = "9572f2b0f49365cc3888999a0c0b7d29694922f0cbefb33e1fbbfc71781cde402537da3a23e36fd3a600a1d819bcef9acbeee423df2699fa9e3f07cfde7f9128"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-runc = { path = "../runc" }
-pigz = { path = "../pigz" }
diff --git a/packages/docker-engine/Cargo.toml b/packages/docker-engine/Cargo.toml
@@ -15,16 +15,7 @@ releases-url = "/~https://github.com/moby/moby/releases"
 url = "/~https://github.com/moby/moby/archive/v25.0.6/moby-25.0.6.tar.gz"
 sha512 = "dc3370927654dd2b0d201d112effc8b83416a4df4ed1c5ac6ffaec40a260b0ebdf95107e8f3dcfe91e54f885697273a2b415541f5ea87ec7c491f6325c51a4cc"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
 libseccomp = { path = "../libseccomp" }
 systemd = { path = "../systemd" }
-
-# RPM Requires
-[dependencies]
-# `containerd`, `iptables`, and `procps` are only needed at runtime, and are
-# pulled in by `release`.
-# containerd = { path = "../containerd" }
-# iptables = { path = "../iptables" }
-# procps = { path = "../procps" }
diff --git a/packages/early-boot-config/Cargo.toml b/packages/early-boot-config/Cargo.toml
@@ -22,9 +22,5 @@ source-groups = [
     "early-boot-config/user-data-providers/vmware-guestinfo",
 ]
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
diff --git a/packages/ecs-agent/Cargo.toml b/packages/ecs-agent/Cargo.toml
@@ -16,15 +16,5 @@ releases-url = "/~https://github.com/aws/amazon-ecs-agent/releases"
 url = "/~https://github.com/aws/amazon-ecs-agent/archive/v1.86.3/amazon-ecs-agent-1.86.3.tar.gz"
 sha512 = "d93129c290c06cff332318644dced900618575b7e540674d58d69f8db1ef90c5a2cf8e41f5af63f97df06df1b20cf9f22bd2252d3e2317984f0ef79252ce25c5"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-# `docker-engine` is only needed at runtime, and is included in the variant
-# definition.
-# docker-engine = { path = "../docker-engine" }
-# `iptables` is only needed at runtime, and is pulled in by `release`.
-# iptables = { path = "../iptables" }
-amazon-ssm-agent = { path = "../amazon-ssm-agent" }
diff --git a/packages/ecs-gpu-init/Cargo.toml b/packages/ecs-gpu-init/Cargo.toml
@@ -11,6 +11,5 @@ source-groups = [ "ecs-gpu-init" ]
 [lib]
 path = "../packages.rs"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/filesystem/Cargo.toml b/packages/filesystem/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 publish = false
 build = "../build.rs"
 
-
 [package.metadata.build-package]
 
 [lib]

diff --git a/packages/grep/Cargo.toml b/packages/grep/Cargo.toml
@@ -15,9 +15,6 @@ releases-url = "https://mirrors.kernel.org/gnu/grep"
 url = "https://mirrors.kernel.org/gnu/grep/grep-3.11.tar.xz"
 sha512 = "f254a1905a08c8173e12fbdd4fd8baed9a200217fba9d7641f0d78e4e002c1f2a621152d67027d9b25f0bb2430898f5233dc70909d8464fd13d7dd9298e65c42"
 
-[dependencies]
-libpcre = { path = "../libpcre" }
-
 [build-dependencies]
 libpcre = { path = "../libpcre" }
 glibc = { path = "../glibc" }
diff --git a/packages/host-ctr/Cargo.toml b/packages/host-ctr/Cargo.toml
@@ -11,11 +11,5 @@ source-groups = [ "host-ctr" ]
 [lib]
 path = "../packages.rs"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-# `containerd` is only needed at runtime, and is pulled in by `release`.
-# containerd = { path = "../containerd" }
diff --git a/packages/kubernetes-1.24/Cargo.toml b/packages/kubernetes-1.24/Cargo.toml
@@ -145,17 +145,5 @@ sha512 = "287f530b8372ffb4384799bc6f53ac373132c851c306a9217c982814404af3bde92901
 url = "https://raw.githubusercontent.com/aws/eks-distro/refs/heads/main/projects/kubernetes/kubernetes/1-24/patches/0037-EKS-PATCH-Add-sourceARN-to-sts-headers.patch"
 sha512 = "cc1e82230d011082aea78bffa921dda41d5004f1cec13ec3f667b6f7067be5a7394be8299decc1d1ca7a70ccfb8e5531ba20be36da7557975c0332091f85e6fc"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-aws-signing-helper = { path = "../aws-signing-helper" }
-ecr-credential-provider = { path = "../ecr-credential-provider" }
-static-pods = { path = "../static-pods" }
-# `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
-# and are pulled in by `release`.
-# conntrack-tools = { path = "../conntrack-tools" }
-# containerd = { path = "../containerd" }
-# findutils = { path = "../findutils" }
diff --git a/packages/kubernetes-1.25/Cargo.toml b/packages/kubernetes-1.25/Cargo.toml
@@ -113,17 +113,5 @@ sha512 = "3b6cd81edaf9758fa6ef8d2843c96f075a47b13dd97f37a3ef01c7584e47c877cdce3d
 url = "https://raw.githubusercontent.com/aws/eks-distro/refs/heads/main/projects/kubernetes/kubernetes/1-25/patches/0025-EKS-PATCH-Add-sourceARN-to-sts-headers.patch"
 sha512 = "521976beffc6b26dc837c767280100188f4be55583cb9d4001206dd028ef044cf98eef86f77bfecd3d4297dbfd5d1949af33d6990ab4f353f28e2dedf6a01ca8"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-aws-signing-helper = { path = "../aws-signing-helper" }
-ecr-credential-provider = { path = "../ecr-credential-provider" }
-static-pods = { path = "../static-pods" }
-# `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
-# and are pulled in by `release`.
-# conntrack-tools = { path = "../conntrack-tools" }
-# containerd = { path = "../containerd" }
-# findutils = { path = "../findutils" }
diff --git a/packages/kubernetes-1.26/Cargo.toml b/packages/kubernetes-1.26/Cargo.toml
@@ -73,17 +73,5 @@ sha512 = "7b65bb30ee2863ea19dbcb74a855c2a898b85e99e43d772228eec81859017cad0949dd
 url = "https://raw.githubusercontent.com/aws/eks-distro/refs/heads/main/projects/kubernetes/kubernetes/1-26/patches/0016-EKS-PATCH-Add-sourceARN-to-sts-headers.patch"
 sha512 = "6a916a0644e98ab8f1bd00c1ac8fc408667ad1d7e0cbb179d2c6fd8d9d9db04fcd0ec8528464b08e5cb5a1718d8e926052138e7dd42301e4acc6f692c4cdbd38"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-aws-signing-helper = { path = "../aws-signing-helper" }
-ecr-credential-provider = { path = "../ecr-credential-provider" }
-static-pods = { path = "../static-pods" }
-# `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
-# and are pulled in by `release`.
-# conntrack-tools = { path = "../conntrack-tools" }
-# containerd = { path = "../containerd" }
-# findutils = { path = "../findutils" }
diff --git a/packages/kubernetes-1.27/Cargo.toml b/packages/kubernetes-1.27/Cargo.toml
@@ -69,17 +69,5 @@ sha512 = "e36830d54594aa9ccca4b2ff3b44105b69522beceee8455846338292b7ab5127c6f4ed
 url = "https://raw.githubusercontent.com/aws/eks-distro/refs/heads/main/projects/kubernetes/kubernetes/1-27/patches/0015-EKS-PATCH-Add-apf-queue-wait-audit-log-latency-annot.patch"
 sha512 = "489e9baba81a3683e7be5de260e82c56628c0546f7032695e2107d3bc42dfbaf059f424f8d423d15ded5d7845ebb21966a886af9eefed132b8c361b8393efe44"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-aws-signing-helper = { path = "../aws-signing-helper" }
-ecr-credential-provider-1_27 = { path = "../ecr-credential-provider-1.27" }
-static-pods = { path = "../static-pods" }
-# `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
-# and are pulled in by `release`.
-# conntrack-tools = { path = "../conntrack-tools" }
-# containerd = { path = "../containerd" }
-# findutils = { path = "../findutils" }
diff --git a/packages/kubernetes-1.28/Cargo.toml b/packages/kubernetes-1.28/Cargo.toml
@@ -17,17 +17,5 @@ package-name = "kubernetes-1.28"
 url = "https://distro.eks.amazonaws.com/kubernetes-1-28/releases/33/artifacts/kubernetes/v1.28.13/kubernetes-src.tar.gz"
 sha512 = "7664cb9c178840e7499ceec22a198d8f6feb794423b533a632d4dd6294f6b4616313bb620473ba2a71171304b498d84d33a87038ae57482de03e040c8c1b3c18"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-aws-signing-helper = { path = "../aws-signing-helper" }
-ecr-credential-provider-1_27 = { path = "../ecr-credential-provider-1.27" }
-static-pods = { path = "../static-pods" }
-# `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
-# and are pulled in by `release`.
-# conntrack-tools = { path = "../conntrack-tools" }
-# containerd = { path = "../containerd" }
-# findutils = { path = "../findutils" }
diff --git a/packages/kubernetes-1.29/Cargo.toml b/packages/kubernetes-1.29/Cargo.toml
@@ -17,17 +17,5 @@ package-name = "kubernetes-1.29"
 url = "https://distro.eks.amazonaws.com/kubernetes-1-29/releases/22/artifacts/kubernetes/v1.29.8/kubernetes-src.tar.gz"
 sha512 = "89dbb4d282da817be9f61035383467339f1146809e3bbd8d848d72cef6ae6c6cc9fc19bcd7ff3d9da0fee6b7fef13e272a76839282a4092a183a55c64c1695fa"
 
-# RPM BuildRequires
 [build-dependencies]
 glibc = { path = "../glibc" }
-
-# RPM Requires
-[dependencies]
-aws-signing-helper = { path = "../aws-signing-helper" }
-ecr-credential-provider-1_29 = { path = "../ecr-credential-provider-1.29" }
-static-pods = { path = "../static-pods" }
-# `conntrack-tools`, `containerd` and `findutils` are only needed at runtime,
-# and are pulled in by `release`.
-# conntrack-tools = { path = "../conntrack-tools" }
-# containerd = { path = "../containerd" }
-# findutils = { path = "../findutils" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ edition = "2021" @@
     publish = false
     build = "../build.rs"
     [package.metadata.build-package]
     [lib]
@@ Expand Down @@