Skip to content

calico-3.29 - usrmerge usr/sbin #44671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smoser merged 3 commits into from
Mar 31, 2025
Merged

calico-3.29 - usrmerge usr/sbin #44671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c24868
calico-3.29 - usrmerge usr/sbin
a-crate Feb 20, 2025
7c146b0
calico-3.29 - usrmerge usr/sbin - bump epoch, add dependencies
smoser Mar 5, 2025
af9e374
Merge /usr/sbin
xnox Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions calico-3.29.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: calico-3.29
version: "3.29.3"
epoch: 0
epoch: 40
description: "Cloud native networking and network security"
copyright:
- license: Apache-2.0
Expand All @@ -10,6 +10,7 @@ package:
- calico=${{package.full-version}}
runtime:
- merged-bin
- merged-usrsbin
- wolfi-baselayout
resources:
cpu: 4
Expand Down Expand Up @@ -177,6 +178,7 @@ subpackages:
- libnfnetlink
- libpcap
- merged-bin
- merged-usrsbin
- procps
- runit
- wolfi-baselayout
Expand Down Expand Up @@ -242,12 +244,12 @@ subpackages:
mkdir -p "${{targets.subpkgdir}}"/etc \
"${{targets.subpkgdir}}"/included-source \
"${{targets.subpkgdir}}"/licenses \
"${{targets.subpkgdir}}"/usr/sbin
"${{targets.subpkgdir}}"/usr/bin

cp -avR ./node/filesystem/etc "${{targets.subpkgdir}}"/
cp -avR ./node/filesystem/included-source "${{targets.subpkgdir}}"/
cp -avR ./node/filesystem/usr "${{targets.subpkgdir}}"/
cp -avR ./node/filesystem/sbin/* "${{targets.subpkgdir}}"/usr/sbin/
cp -avR ./node/filesystem/sbin/* "${{targets.subpkgdir}}"/usr/bin/
cp ./node/LICENSE "${{targets.subpkgdir}}"/licenses/

# TODO: Proper fix for this
Expand All @@ -264,6 +266,7 @@ subpackages:
- libbpf
- libelf
- merged-bin
- merged-usrsbin
- wolfi-baselayout
- zlib
pipeline:
Expand Down Expand Up @@ -343,6 +346,7 @@ subpackages:
- cni-plugins-tuning
- flannel-cni-plugin
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
# NOTE: cni is a multicall binary: https://github.com/projectcalico/calico/blob/master/cni-plugin/cmd/calico/calico.go
Expand Down Expand Up @@ -386,6 +390,7 @@ subpackages:
- cni-plugins-tuning-compat
- flannel-cni-plugin-compat
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- runs: |
Expand All @@ -401,6 +406,7 @@ subpackages:
runtime:
- glibc
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- uses: go/build
Expand All @@ -417,6 +423,7 @@ subpackages:
- calico-apiserver-compat=${{package.full-version}}
runtime:
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- runs: |
Expand All @@ -430,6 +437,7 @@ subpackages:
runtime:
- glibc
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- uses: go/build
Expand All @@ -445,6 +453,7 @@ subpackages:
runtime:
- glibc
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- uses: go/build
Expand All @@ -466,6 +475,7 @@ subpackages:
runtime:
- glibc-dev
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- uses: go/build
Expand All @@ -489,6 +499,7 @@ subpackages:
runtime:
- glibc
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- uses: go/build
Expand Down Expand Up @@ -516,6 +527,7 @@ subpackages:
- calico-pod2daemon-flexvol-compat=${{package.full-version}}
runtime:
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- runs: |
Expand All @@ -529,6 +541,7 @@ subpackages:
- calicoctl=${{package.full-version}}
runtime:
- merged-bin
- merged-usrsbin
- wolfi-baselayout
pipeline:
- uses: go/build
Expand All @@ -546,6 +559,7 @@ subpackages:
runtime:
- glibc
- merged-bin
- 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
Expand Down Expand Up @@ -576,6 +590,7 @@ subpackages:
runtime:
- glibc
- merged-bin
- 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
Expand Down Expand Up @@ -620,7 +635,7 @@ test:
/usr/bin/calico-pod2daemon-csidriver --help
/usr/bin/calico-pod2daemon-flexvol --help
/usr/bin/calico-kube-controllers --help
/usr/sbin/start_runit 2>&1 | grep -q 'no configuration has been provided'
/usr/bin/start_runit 2>&1 | grep -q 'no configuration has been provided'
/usr/bin/calico-typha --help
/usr/bin/typha-client --help
- name: Test compat package paths
Expand Down
8 changes: 4 additions & 4 deletions wolfi-baselayout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: wolfi-baselayout
version: 20230201
epoch: 19
epoch: 20
description: "baselayout data for Wolfi"
copyright:
- license: MIT
Expand All @@ -11,7 +11,7 @@ package:
provides:
- merged-sbin
- merged-bin
#- merged-usrsbin
- merged-usrsbin
#- merged-lib

environment:
Expand Down Expand Up @@ -50,13 +50,13 @@ pipeline:
# split-usr
# mkdir -p ${{targets.destdir}}/sbin
# mkdir -p ${{targets.destdir}}/bin
mkdir -p ${{targets.destdir}}/usr/sbin
# mkdir -p ${{targets.destdir}}/usr/sbin
mkdir -p ${{targets.destdir}}/lib

# usr-merge
ln -s usr/bin ${{targets.destdir}}/sbin
ln -s usr/bin ${{targets.destdir}}/bin
# ln -s bin ${{targets.destdir}}/usr/sbin
ln -s bin ${{targets.destdir}}/usr/sbin
# ln -s usr/lib ${{targets.destdir}}/usr/lib

for i in lib64 usr/lib64 usr/local/lib64; do
Expand Down
Loading