diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2017-09-13 12:39:46 -0700 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-14 09:49:00 -0400 |
| commit | 01a8d4537012ad93dc8510e9b762acdc8c4536c7 (patch) | |
| tree | 8b22ba0333f7a8c83193bee31b33a3b307f1164a /recipes-containers/oci-image-tools/files/0001-image-manifest-Recursively-remove-pre-existing-entri.patch | |
| parent | 718592922bd64da4d609c96e831f6aba05e44a8d (diff) | |
| download | meta-virtualization-01a8d4537012ad93dc8510e9b762acdc8c4536c7.tar.gz | |
nets, docker, runc, oci-*tools: go.bbclass compile fixes
Recently in the oe-core the go.bbclass changed and requires the
defition of the GO_IMPORT variable. This was intended to simplify how
the compilation works with go packages and it is still a work in
progress.
This patch set makes the recipes compatible to generate the same end
result as before using the new go.bbclass from oe-core.
Any patches that were included in the recipes had to have the paths
adjusted because the new go.bbclass manipulates the notion of S to be
S + "src" + "$GO_IMPORT" internally for the purpose of unpack, patch
and compile.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/oci-image-tools/files/0001-image-manifest-Recursively-remove-pre-existing-entri.patch')
| -rw-r--r-- | recipes-containers/oci-image-tools/files/0001-image-manifest-Recursively-remove-pre-existing-entri.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-containers/oci-image-tools/files/0001-image-manifest-Recursively-remove-pre-existing-entri.patch b/recipes-containers/oci-image-tools/files/0001-image-manifest-Recursively-remove-pre-existing-entri.patch index d2cacc2e..5594f976 100644 --- a/recipes-containers/oci-image-tools/files/0001-image-manifest-Recursively-remove-pre-existing-entri.patch +++ b/recipes-containers/oci-image-tools/files/0001-image-manifest-Recursively-remove-pre-existing-entri.patch | |||
| @@ -40,8 +40,8 @@ Signed-off-by: W. Trevor King <wking@tremily.us> | |||
| 40 | 40 | ||
| 41 | diff --git a/image/manifest.go b/image/manifest.go | 41 | diff --git a/image/manifest.go b/image/manifest.go |
| 42 | index 8834c1e5f2f0..144bd4f62219 100644 | 42 | index 8834c1e5f2f0..144bd4f62219 100644 |
| 43 | --- a/image/manifest.go | 43 | --- a/src/import/image/manifest.go |
| 44 | +++ b/image/manifest.go | 44 | +++ b/src/import/image/manifest.go |
| 45 | @@ -253,11 +253,27 @@ loop: | 45 | @@ -253,11 +253,27 @@ loop: |
| 46 | continue loop | 46 | continue loop |
| 47 | } | 47 | } |
