Bump epoch and add dependency on merged-usrsbin

Signed-off-by: Amelia Crate <[email protected]>
wolfi-dev · Mar 5, 2025 · e055afb · e055afb
1 parent 562f718
commit e055afb
Show file tree

Hide file tree

Showing 21 changed files with 249 additions and 40 deletions.
diff --git a/busybox.yaml b/busybox.yaml
@@ -1,14 +1,15 @@
 package:
   name: busybox
   version: 1.37.0
-  epoch: 20
+  epoch: 40
   description: "swiss-army knife for embedded systems"
   copyright:
     - license: GPL-2.0-only
   dependencies:
     provider-priority: 10
     runtime:
       - merged-sbin
+      - merged-usrsbin
       - wolfi-baselayout
   scriptlets:
     trigger:
@@ -82,6 +83,7 @@ subpackages:
       provider-priority: 5
       runtime:
         - merged-sbin
+        - merged-usrsbin
         - wolfi-baselayout
     options:
       no-commands: true

diff --git a/calico-3.29.yaml b/calico-3.29.yaml
@@ -1,13 +1,16 @@
 package:
   name: calico-3.29
   version: "3.29.2"
-  epoch: 1
+  epoch: 40
   description: "Cloud native networking and network security"
   copyright:
     - license: Apache-2.0
   dependencies:
     provides:
       - calico=${{package.full-version}}
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
   resources:
     cpu: 4
     memory: 12Gi
@@ -142,26 +145,28 @@ subpackages:
       provides:
         - calico-node=${{package.full-version}}
       runtime:
-        - runit
         - bash # required for logging functionality to work since `start_runit` logging script uses #!/bin/bash
-        - iptables
+        - conntrack-tools
+        - glibc
         - ip6tables
+        - iproute2
         - ipset
-        - libpcap
-        - libelf
-        - zlib
+        - iptables
         - libbpf
         # listed in Dockerfile, but not sure if they're build dependencies (for iptables) or runtime
+        - libelf
         - libmnl
-        - libnfnetlink
         - libnetfilter_conntrack
-        - iproute2
-        - procps
-        - conntrack-tools
         - libnetfilter_cthelper
         - libnetfilter_cttimeout
         - libnetfilter_queue
-        - glibc
+        - libnfnetlink
+        - libpcap
+        - merged-usrsbin
+        - procps
+        - runit
+        - wolfi-baselayout
+        - zlib
     pipeline:
       - assertions:
           required-steps: 2
@@ -241,11 +246,13 @@ subpackages:
       provides:
         - calico-felix=${{package.full-version}}
       runtime:
+        - glibc
         - iproute2
+        - libbpf
         - libelf
+        - merged-usrsbin
+        - wolfi-baselayout
         - zlib
-        - libbpf
-        - glibc
     pipeline:
       - working-directory: felix
       - runs: |
@@ -316,12 +323,14 @@ subpackages:
       provides:
         - calico-cni=${{package.full-version}}
       runtime:
-        - flannel-cni-plugin
-        - cni-plugins-loopback
+        - cni-plugins-bandwidth
         - cni-plugins-host-local
+        - cni-plugins-loopback
         - cni-plugins-portmap
         - cni-plugins-tuning
-        - cni-plugins-bandwidth
+        - flannel-cni-plugin
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       # NOTE: cni is a multicall binary: https://github.com/projectcalico/calico/blob/master/cni-plugin/cmd/calico/calico.go
       # install is not a part of that multicall binary anymore (as of calico 3.27.1)
@@ -357,12 +366,14 @@ subpackages:
         - calico-cni-compat=${{package.full-version}}
       runtime:
         - calico-cni
-        - flannel-cni-plugin-compat
-        - cni-plugins-loopback-compat
+        - cni-plugins-bandwidth-compat
         - cni-plugins-host-local-compat
+        - cni-plugins-loopback-compat
         - cni-plugins-portmap-compat
         - cni-plugins-tuning-compat
-        - cni-plugins-bandwidth-compat
+        - flannel-cni-plugin-compat
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/opt/cni/bin
@@ -376,6 +387,8 @@ subpackages:
         - calico-apiserver=${{package.full-version}}
       runtime:
         - glibc
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: go/build
         with:
@@ -389,6 +402,9 @@ subpackages:
     dependencies:
       provides:
         - calico-apiserver-compat=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/code
@@ -400,6 +416,8 @@ subpackages:
         - calico-key-cert-provisioner=${{package.full-version}}
       runtime:
         - glibc
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: go/build
         with:
@@ -413,6 +431,8 @@ subpackages:
         - calico-app-policy=${{package.full-version}}
       runtime:
         - glibc
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: go/build
         with:
@@ -432,6 +452,8 @@ subpackages:
         - calico-kube-controllers=${{package.full-version}}
       runtime:
         - glibc-dev
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: go/build
         with:
@@ -453,6 +475,8 @@ subpackages:
         - calico-pod2daemon=${{package.full-version}}
       runtime:
         - glibc
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: go/build
         with:
@@ -477,6 +501,9 @@ subpackages:
     dependencies:
       provides:
         - calico-pod2daemon-flexvol-compat=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - runs: |
           mkdir -p "${{targets.subpkgdir}}"/usr/local/bin
@@ -487,6 +514,9 @@ subpackages:
     dependencies:
       provides:
         - calicoctl=${{package.full-version}}
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       - uses: go/build
         with:
@@ -502,6 +532,8 @@ subpackages:
         - calico-typhad=${{package.full-version}}
       runtime:
         - glibc
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       # TODO: I'm not sure yet if this actually needs CGO, or is just enabled upstream because of go-fips
       - runs: |
@@ -530,6 +562,8 @@ subpackages:
         - calico-typha-client=${{package.full-version}}
       runtime:
         - glibc
+        - merged-usrsbin
+        - wolfi-baselayout
     pipeline:
       # TODO: I'm not sure yet if this actually needs CGO, or is just enabled upstream because of go-fips
       - runs: |

diff --git a/cifs-utils.yaml b/cifs-utils.yaml
@@ -1,13 +1,14 @@
 package:
   name: cifs-utils
   version: "7.2"
-  epoch: 20
+  epoch: 40
   description: CIFS filesystem user-space tools
   copyright:
     - license: GPL-3.0-or-later
   dependencies:
     runtime:
       - merged-sbin
+      - merged-usrsbin
       - wolfi-baselayout
 
 environment:
@@ -50,6 +51,7 @@ subpackages:
       runtime:
         - cifs-utils
         - merged-sbin
+        - merged-usrsbin
         - wolfi-baselayout
 
   - name: "cifs-utils-doc"
@@ -62,6 +64,7 @@ subpackages:
     dependencies:
       runtime:
         - merged-sbin
+        - merged-usrsbin
         - wolfi-baselayout
 
 update:

diff --git a/coreutils.yaml b/coreutils.yaml
@@ -1,14 +1,18 @@
 package:
   name: coreutils
   version: "9.6"
-  epoch: 0
+  epoch: 40
   description: "GNU core utilities"
   copyright:
     - license: GPL-3.0-or-later
   scriptlets:
     post-deinstall: |
       #!/bin/busybox sh
       /bin/busybox --install -s
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -65,6 +69,10 @@ subpackages:
     test:
       pipeline:
         - uses: test/docs
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
   - name: "coreutils-legacy"
     description: "legacy GNU coreutils"
@@ -73,6 +81,10 @@ subpackages:
           mkdir -p "${{targets.subpkgdir}}"/usr/bin
           mv "${{targets.destdir}}"/usr/bin/md5sum "${{targets.subpkgdir}}"/usr/bin
           mv "${{targets.destdir}}"/usr/bin/sha1sum "${{targets.subpkgdir}}"/usr/bin
+    dependencies:
+      runtime:
+        - merged-usrsbin
+        - wolfi-baselayout
 
 update:
   enabled: true

diff --git a/crac-criu.yaml b/crac-criu.yaml
@@ -1,10 +1,14 @@
 package:
   name: crac-criu
   version: 1.5.0.0.1
-  epoch: 0
+  epoch: 40
   description: A project to implement checkpoint/restore functionality for Linux
   copyright:
     - license: GPL-2.0-only
+  dependencies:
+    runtime:
+      - merged-usrsbin
+      - wolfi-baselayout
 
 var-transforms:
   - from: ${{package.version}}

diff --git a/dhclient.yaml b/dhclient.yaml
@@ -1,7 +1,7 @@
 package:
   name: dhclient
   version: 4.4.3
-  epoch: 20
+  epoch: 40
   description: dhcp client program
   copyright:
     - license: BSD-2-Clause
@@ -10,6 +10,7 @@ package:
       - coreutils
       - iproute2
       - merged-sbin
+      - merged-usrsbin
       - wolfi-baselayout
 
 environment: