summaryrefslogtreecommitdiffstats
path: root/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-09-14 22:01:22 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2022-09-14 22:01:22 -0400
commit79ff2a5b00900b95076ca838a79d90ede59abdad (patch)
tree646543be406565d59dd12bdd6d39c3176227c12f /recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
parent1242b97f7f488180554dabc65a1d5c5e140a5876 (diff)
downloadmeta-virtualization-79ff2a5b00900b95076ca838a79d90ede59abdad.tar.gz
oci-image-tools: fix TMPDIR references
The structure of the source code layout that was used by this recipe required symlinking subirectories of the source into a location that would be searched by go. While this fixes the build, and produces a working binary, go stores the location into the binary itself. Those stored paths reference the build directory, making the result not reproducible. With this change, we create an alternate structure that doesn't require symlinking and allows go to find the components during build. This results in a simpler recipe and binaries without TMPDIR references. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch')
-rw-r--r--recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch b/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
index 78d2b9d0..b61d4f49 100644
--- a/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
+++ b/recipes-containers/oci-image-tools/files/0001-config-make-Config.User-mapping-errors-a-warning.patch
@@ -12,10 +12,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
12 image/config.go | 2 +- 12 image/config.go | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/src/import/image/config.go b/src/import/image/config.go 15diff --git a/image/config.go b/image/config.go
16index d28b1bc4fe5f..37dfd1f14ef7 100644 16index d28b1bc4fe5f..37dfd1f14ef7 100644
17--- a/src/import/image/config.go 17--- a/image/config.go
18+++ b/src/import/image/config.go 18+++ b/image/config.go
19@@ -106,7 +106,7 @@ func (c *config) runtimeSpec(rootfs string) (*specs.Spec, error) { 19@@ -106,7 +106,7 @@ func (c *config) runtimeSpec(rootfs string) (*specs.Spec, error) {
20 s.Process.User.UID = uint32(uid) 20 s.Process.User.UID = uint32(uid)
21 s.Process.User.GID = uint32(gid) 21 s.Process.User.GID = uint32(gid)