Fix RunC packaging

cloudfoundry · Dec 18, 2024 · e782a90 · e782a90
1 parent f56bbb3
commit e782a90
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/packages/runc/packaging b/packages/runc/packaging
@@ -34,6 +34,6 @@ if [[ "${DISTRIB_CODENAME}" == "xenial" ]]; then
 fi
 
 pushd src/guardian/vendor/github.com/opencontainers/runc
-  make BUILDTAGS='seccomp apparmor' static
+  make static
   cp runc "${GOBIN}/runc"
 popd
diff --git a/packages/runc/spec b/packages/runc/spec
@@ -11,16 +11,18 @@ files:
   - guardian/go.mod
   - guardian/go.sum
   - guardian/vendor/modules.txt
-  - guardian/vendor/github.com/checkpoint-restore/go-criu/v5/*.go # gosub
-  - guardian/vendor/github.com/checkpoint-restore/go-criu/v5/Makefile # gosub
-  - guardian/vendor/github.com/checkpoint-restore/go-criu/v5/rpc/*.go # gosub
+  - guardian/vendor/github.com/checkpoint-restore/go-criu/v6/*.go # gosub
+  - guardian/vendor/github.com/checkpoint-restore/go-criu/v6/Makefile # gosub
+  - guardian/vendor/github.com/checkpoint-restore/go-criu/v6/rpc/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/Makefile # gosub
   - guardian/vendor/github.com/cilium/ebpf/asm/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/btf/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/internal/*.go # gosub
+  - guardian/vendor/github.com/cilium/ebpf/internal/kallsyms/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/internal/kconfig/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/internal/sys/*.go # gosub
+  - guardian/vendor/github.com/cilium/ebpf/internal/sysenc/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/internal/tracefs/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/internal/unix/*.go # gosub
   - guardian/vendor/github.com/cilium/ebpf/link/*.go # gosub
@@ -32,6 +34,8 @@ files:
   - guardian/vendor/github.com/docker/go-units/*.go # gosub
   - guardian/vendor/github.com/godbus/dbus/v5/*.go # gosub
   - guardian/vendor/github.com/moby/sys/mountinfo/*.go # gosub
+  - guardian/vendor/github.com/moby/sys/user/*.go # gosub
+  - guardian/vendor/github.com/moby/sys/userns/*.go # gosub
   - guardian/vendor/github.com/mrunalp/fileutils/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/Makefile # gosub
@@ -40,8 +44,6 @@ files:
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/capabilities/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/cgroups/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/cgroups/devices/*.go # gosub
-  - guardian/vendor/github.com/opencontainers/runc/libcontainer/cgroups/ebpf/*.go # gosub
-  - guardian/vendor/github.com/opencontainers/runc/libcontainer/cgroups/ebpf/devicefilter/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs2/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/cgroups/fscommon/*.go # gosub
@@ -50,7 +52,10 @@ files:
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/configs/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/configs/validate/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/devices/*.go # gosub
+  - guardian/vendor/github.com/opencontainers/runc/libcontainer/dmz/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/intelrdt/*.go # gosub
+  - guardian/vendor/github.com/opencontainers/runc/libcontainer/internal/userns/*.go # gosub
+  - guardian/vendor/github.com/opencontainers/runc/libcontainer/internal/userns/*.c # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/keys/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/logs/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/nsenter/*.go # gosub
@@ -60,13 +65,12 @@ files:
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/seccomp/patchbpf/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/specconv/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/system/*.go # gosub
-  - guardian/vendor/github.com/opencontainers/runc/libcontainer/user/*.go # gosub
-  - guardian/vendor/github.com/opencontainers/runc/libcontainer/userns/*.go # gosub
-  - guardian/vendor/github.com/opencontainers/runc/libcontainer/userns/*.c # gosub
+  - guardian/vendor/github.com/opencontainers/runc/libcontainer/system/kernelversion/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/libcontainer/utils/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/types/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runc/types/features/*.go # gosub
   - guardian/vendor/github.com/opencontainers/runtime-spec/specs-go/*.go # gosub
+  - guardian/vendor/github.com/opencontainers/runtime-spec/specs-go/features/*.go # gosub
   - guardian/vendor/github.com/opencontainers/selinux/go-selinux/*.go # gosub
   - guardian/vendor/github.com/opencontainers/selinux/go-selinux/label/*.go # gosub
   - guardian/vendor/github.com/opencontainers/selinux/pkg/pwalkdir/*.go # gosub
@@ -81,8 +85,6 @@ files:
   - guardian/vendor/github.com/vishvananda/netlink/nl/*.go # gosub
   - guardian/vendor/github.com/vishvananda/netns/*.go # gosub
   - guardian/vendor/golang.org/x/exp/constraints/*.go # gosub
-  - guardian/vendor/golang.org/x/exp/maps/*.go # gosub
-  - guardian/vendor/golang.org/x/exp/slices/*.go # gosub
   - guardian/vendor/golang.org/x/net/bpf/*.go # gosub
   - guardian/vendor/golang.org/x/sys/unix/*.go # gosub
   - guardian/vendor/golang.org/x/sys/unix/*.s # gosub