nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #310182 from WxNzEMof/podman-5-fixes

Browse Source 
podman: improve runtime patching
This commit is contained in:
Kevin Cox 2024-05-13 17:05:05 -04:00 committed by GitHub
commit 4d50d8dfa8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/virtualization/podman/default.nix
View File

@ -19,11 +19,10 @@
, symlinkJoin
, substituteAll
, extraPackages ? [ ]
, runc
, crun
, gvisor
, youki
, runc
, conmon
, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki
, slirp4netns
, fuse-overlayfs
, util-linux
@ -59,7 +58,9 @@ let
netavark
slirp4netns
passt
];
conmon
crun
] ++ extraRuntimes;
};
in
buildGoModule rec {
@ -74,13 +75,13 @@ buildGoModule rec {
};
patches = [
# we intentionally don't build and install the helper so we shouldn't display messages to users about it
./rm-podman-mac-helper-msg.patch
] ++ lib.optionals stdenv.isLinux [
(substituteAll {
src = ./hardcode-paths.patch;
inherit crun runc gvisor youki conmon;
bin_path = helpersBin;
})
# we intentionally don't build and install the helper so we shouldn't display messages to users about it
./rm-podman-mac-helper-msg.patch
];
vendorHash = null;

41
pkgs/applications/virtualization/podman/hardcode-paths.patch
View File

@ -1,8 +1,8 @@
diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
index 19c4bb6bf..2743de4b2 100644
index 3a6d804ad..5628e2bf6 100644
--- a/vendor/github.com/containers/common/pkg/config/default.go
+++ b/vendor/github.com/containers/common/pkg/config/default.go
@@ -364,75 +364,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
@@ -366,75 +366,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
c.Retry = 3
c.OCIRuntimes = map[string][]string{
"crun": {
@ -13,7 +13,7 @@ index 19c4bb6bf..2743de4b2 100644
- "/sbin/crun",
- "/bin/crun",
- "/run/current-system/sw/bin/crun",
+ "@crun@/bin/crun",
+ "@bin_path@/bin/crun",
},
"crun-vm": {
- "/usr/bin/crun-vm",
@ -22,7 +22,7 @@ index 19c4bb6bf..2743de4b2 100644
- "/sbin/crun-vm",
- "/bin/crun-vm",
- "/run/current-system/sw/bin/crun-vm",
+ // TODO: "@crun-vm@/bin/crun-vm",
+ "@bin_path@/bin/crun-vm",
},
"crun-wasm": {
- "/usr/bin/crun-wasm",
@ -32,7 +32,7 @@ index 19c4bb6bf..2743de4b2 100644
- "/sbin/crun-wasm",
- "/bin/crun-wasm",
- "/run/current-system/sw/bin/crun-wasm",
+ // TODO: "@crun-wasm@/bin/crun-wasm",
+ "@bin_path@/bin/crun-wasm",
},
"runc": {
- "/usr/bin/runc",
@ -43,11 +43,11 @@ index 19c4bb6bf..2743de4b2 100644
- "/bin/runc",
- "/usr/lib/cri-o-runc/sbin/runc",
- "/run/current-system/sw/bin/runc",
+ "@runc@/bin/runc",
+ "@bin_path@/bin/runc",
},
"runj": {
- "/usr/local/bin/runj",
+ // TODO: "@runj@/bin/runj",
+ "@bin_path@/bin/runj",
},
"kata": {
- "/usr/bin/kata-runtime",
@ -58,7 +58,7 @@ index 19c4bb6bf..2743de4b2 100644
- "/bin/kata-runtime",
- "/usr/bin/kata-qemu",
- "/usr/bin/kata-fc",
+ // TODO: "@kata@/bin/kata",
+ "@bin_path@/bin/kata-runtime",
},
"runsc": {
- "/usr/bin/runsc",
@ -68,27 +68,27 @@ index 19c4bb6bf..2743de4b2 100644
- "/bin/runsc",
- "/sbin/runsc",
- "/run/current-system/sw/bin/runsc",
+ "@gvisor@/bin/runsc",
+ "@bin_path@/bin/runsc",
},
"youki": {
- "/usr/local/bin/youki",
- "/usr/bin/youki",
- "/bin/youki",
- "/run/current-system/sw/bin/youki",
+ "@youki@/bin/youki",
+ "@bin_path@/bin/youki",
},
"krun": {
- "/usr/bin/krun",
- "/usr/local/bin/krun",
+ // TODO: "@krun@/bin/krun",
+ "@bin_path@/bin/krun",
},
"ocijail": {
- "/usr/local/bin/ocijail",
+ // TODO: "@ocijail@/bin/ocijail",
+ "@bin_path@/bin/ocijail",
},
}
c.PlatformToOCIRuntime = map[string]string{
@@ -443,16 +402,9 @@ func defaultEngineConfig() (*EngineConfig, error) {
@@ -445,26 +404,12 @@ func defaultEngineConfig() (*EngineConfig, error) {
// Needs to be called after populating c.OCIRuntimes.
c.OCIRuntime = c.findRuntime()
@ -103,7 +103,18 @@ index 19c4bb6bf..2743de4b2 100644
- "/usr/local/bin/conmon",
- "/usr/local/sbin/conmon",
- "/run/current-system/sw/bin/conmon",
+ "@conmon@/bin/conmon",
+ "@bin_path@/bin/conmon",
})
c.ConmonRsPath.Set([]string{
"/usr/libexec/podman/conmonrs",
- "/usr/libexec/podman/conmonrs",
- "/usr/local/libexec/podman/conmonrs",
- "/usr/local/lib/podman/conmonrs",
- "/usr/bin/conmonrs",
- "/usr/sbin/conmonrs",
- "/usr/local/bin/conmonrs",
- "/usr/local/sbin/conmonrs",
- "/run/current-system/sw/bin/conmonrs",
+ "@bin_path@/bin/conmonrs",
})
c.PullPolicy = DefaultPullPolicy
c.RuntimeSupportsJSON.Set([]string{