From 839e78e9fb6cf184bde5941a9f65cdd2c053dfae Mon Sep 17 00:00:00 2001 From: Amelia Crate Date: Thu, 27 Feb 2025 16:46:12 -0800 Subject: [PATCH] Bump epoch and add dependency on merged-usrsbin Signed-off-by: Amelia Crate --- calico-3.29.yaml | 72 +++++++++++++++++++++++++++++++++++------------- cifs-utils.yaml | 5 +++- coreutils.yaml | 14 +++++++++- dhclient.yaml | 3 +- glibc.yaml | 26 +++++++++++++++-- iputils.yaml | 6 +++- lvm2.yaml | 10 ++++++- nfs-utils.yaml | 11 +++++++- systemd.yaml | 22 ++++++++++++++- util-linux.yaml | 9 +++++- zfs.yaml | 8 +++++- 11 files changed, 156 insertions(+), 30 deletions(-) diff --git a/calico-3.29.yaml b/calico-3.29.yaml index ac7e3885b7b..ecfa4166cca 100644 --- 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 index 3d1090970d6..149d1a363b0 100644 --- 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 index e346e5f7c65..6645dde52ec 100644 --- a/coreutils.yaml +++ b/coreutils.yaml @@ -1,7 +1,7 @@ package: name: coreutils version: "9.6" - epoch: 0 + epoch: 40 description: "GNU core utilities" copyright: - license: GPL-3.0-or-later @@ -9,6 +9,10 @@ package: 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/dhclient.yaml b/dhclient.yaml index 5884d367c6f..be415604961 100644 --- 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: diff --git a/glibc.yaml b/glibc.yaml index a5a5b07a3c8..316f0b00be9 100644 --- a/glibc.yaml +++ b/glibc.yaml @@ -1,7 +1,7 @@ package: name: glibc version: 2.40 - epoch: 20 + epoch: 40 description: "the GNU C library" copyright: - license: LGPL-2.1-or-later @@ -19,7 +19,7 @@ package: # Needed for some pthread functionality - libgcc - merged-sbin - - wolfi-baselayout + - merged-usrsbin - wolfi-baselayout scriptlets: trigger: @@ -373,6 +373,10 @@ subpackages: find . \( -name "*.test-result" -o -name "*.out" \) \ -exec sh -c 'dir=$(dirname $1); mkdir -p $2/$dir; cp $1 $2/$dir' _ {} $resultdir \; cp tests.sum $resultdir + dependencies: + runtime: + - merged-usrsbin + - wolfi-baselayout - name: "ld-linux" description: "the GLIBC ELF interpreter" @@ -397,6 +401,7 @@ subpackages: runtime: - merged-sbin - wolfi-baselayout + - merged-usrsbin - wolfi-baselayout test: environment: @@ -450,6 +455,7 @@ subpackages: - libxcrypt-dev - linux-headers - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "glibc-iconv" @@ -469,6 +475,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "glibc-locales" @@ -481,6 +488,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "tzutils" @@ -504,6 +512,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "posix-libc-utils" @@ -512,6 +521,7 @@ subpackages: runtime: - bash - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -556,6 +566,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "sotruss" @@ -578,6 +589,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "nscd" @@ -594,6 +606,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "nss-db" @@ -618,6 +631,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "nss-hesiod" @@ -634,6 +648,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "pcprofiledump" @@ -653,6 +668,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "glibc-tracing" @@ -673,6 +689,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "sln" @@ -689,6 +706,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "libcrypt1" @@ -700,6 +718,7 @@ subpackages: runtime: - libxcrypt - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "glibc-locale-posix" @@ -711,6 +730,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - range: locales @@ -730,6 +750,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout # Similar to https://packages.debian.org/bookworm/libc-bin @@ -739,6 +760,7 @@ subpackages: runtime: - localedef - merged-sbin + - merged-usrsbin - posix-libc-utils - tzutils - wolfi-baselayout diff --git a/iputils.yaml b/iputils.yaml index acd0630551f..e73e9964bbb 100644 --- a/iputils.yaml +++ b/iputils.yaml @@ -1,10 +1,14 @@ package: name: iputils version: "20240905" - epoch: 1 + epoch: 40 description: IP Configuration Utilities copyright: - license: BSD-3-Clause AND GPL-2.0-or-later + dependencies: + runtime: + - merged-usrsbin + - wolfi-baselayout environment: contents: diff --git a/lvm2.yaml b/lvm2.yaml index dec897c54fc..c75189d1f57 100644 --- a/lvm2.yaml +++ b/lvm2.yaml @@ -2,13 +2,14 @@ package: name: lvm2 version: "2.03.31" - epoch: 20 + epoch: 40 description: Logical Volume Manager 2 utilities copyright: - license: GPL-2.0-only AND LGPL-2.1-only dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout var-transforms: @@ -86,6 +87,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: device-mapper-static @@ -95,6 +97,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: device-mapper-libs @@ -110,6 +113,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: device-mapper-event-libs @@ -125,6 +129,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: lvm2-dev @@ -139,6 +144,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: lvm2-doc @@ -151,6 +157,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: device-mapper @@ -175,6 +182,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout update: diff --git a/nfs-utils.yaml b/nfs-utils.yaml index cd3854cc189..17dfe6cbec5 100644 --- a/nfs-utils.yaml +++ b/nfs-utils.yaml @@ -1,7 +1,7 @@ package: name: nfs-utils version: 2.8.2 - epoch: 20 + epoch: 40 description: kernel-mode NFS copyright: - license: GPL-2.0-only @@ -9,6 +9,7 @@ package: runtime: - busybox - merged-sbin + - merged-usrsbin - python3 - wolfi-baselayout @@ -77,6 +78,10 @@ subpackages: test: pipeline: - uses: test/pkgconf + dependencies: + runtime: + - merged-usrsbin + - wolfi-baselayout - name: ${{package.name}}-static description: "${{package.name}} static library" @@ -85,6 +90,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: ${{package.name}}-doc @@ -97,6 +103,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: ${{package.name}}-db @@ -106,6 +113,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: rpcgen @@ -122,6 +130,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout update: diff --git a/systemd.yaml b/systemd.yaml index 95103e975a3..eb7dfd484e2 100644 --- a/systemd.yaml +++ b/systemd.yaml @@ -1,7 +1,7 @@ package: name: systemd version: "257.3" - epoch: 20 + epoch: 40 description: The systemd System and Service Manager copyright: - license: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -12,6 +12,7 @@ package: runtime: - kmod - merged-sbin + - merged-usrsbin - wolfi-baselayout vars: @@ -114,6 +115,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: systemd-shutdown-standalone @@ -126,6 +128,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "systemd-dev" @@ -134,6 +137,7 @@ subpackages: runtime: - libudev - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - uses: split/dev @@ -147,6 +151,7 @@ subpackages: provider-priority: 10 runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -172,6 +177,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "libsystemd-shared" @@ -188,6 +194,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "systemd-boot-installed" @@ -217,6 +224,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: "systemd-boot" @@ -225,6 +233,7 @@ subpackages: runtime: - libsystemd-shared - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -253,6 +262,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - systemd - systemd-container - wolfi-baselayout @@ -308,6 +318,7 @@ subpackages: runtime: - gnutar - merged-sbin + - merged-usrsbin - systemd - wolfi-baselayout pipeline: @@ -388,6 +399,7 @@ subpackages: runtime: - libsystemd-shared - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -426,6 +438,7 @@ subpackages: - agetty - kbd - merged-sbin + - merged-usrsbin - mount - tzdata - wolfi-baselayout @@ -448,6 +461,7 @@ subpackages: runtime: - ${{package.name}} - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -461,6 +475,7 @@ subpackages: runtime: - ${{package.name}} - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -473,6 +488,7 @@ subpackages: runtime: - ${{package.name}} - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -486,6 +502,7 @@ subpackages: runtime: - ${{package.name}} - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -509,6 +526,7 @@ subpackages: runtime: - ${{package.name}} - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -521,6 +539,7 @@ subpackages: runtime: - ${{package.name}} - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | @@ -541,6 +560,7 @@ subpackages: runtime: - ${{package.name}} - merged-sbin + - merged-usrsbin - wolfi-baselayout pipeline: - runs: | diff --git a/util-linux.yaml b/util-linux.yaml index be3b3ccf77d..b96d5dec3d0 100644 --- a/util-linux.yaml +++ b/util-linux.yaml @@ -1,7 +1,7 @@ package: name: util-linux version: "2.40.4" - epoch: 20 + epoch: 40 description: Random collection of Linux utilities copyright: - license: |- @@ -9,6 +9,7 @@ package: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout environment: @@ -109,6 +110,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - util-linux - wolfi-baselayout description: util-linux dev @@ -126,6 +128,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - range: libs @@ -144,6 +147,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - range: bins @@ -160,6 +164,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: util-linux-login @@ -167,6 +172,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - runuser - wolfi-baselayout pipeline: @@ -406,6 +412,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout update: diff --git a/zfs.yaml b/zfs.yaml index 5a88c64f172..fbbe2ef3aac 100644 --- a/zfs.yaml +++ b/zfs.yaml @@ -2,13 +2,14 @@ package: name: zfs version: "2.3.0" - epoch: 20 + epoch: 40 description: Advanced filesystem and volume manager copyright: - license: CDDL-1.0 dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout environment: @@ -77,6 +78,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: zfs-doc @@ -89,6 +91,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: zfs-udev @@ -100,6 +103,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: zfs-scripts @@ -111,6 +115,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout - name: zfs-utils-py @@ -125,6 +130,7 @@ subpackages: dependencies: runtime: - merged-sbin + - merged-usrsbin - wolfi-baselayout update: