diff options
Diffstat (limited to 'recipes-containers/containerd/containerd-opencontainers')
2 files changed, 6 insertions, 6 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch index 7f4d7518..0ef0d38f 100644 --- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch +++ b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch | |||
| @@ -19,10 +19,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | |||
| 19 | Makefile | 3 ++- | 19 | Makefile | 3 ++- |
| 20 | 1 file changed, 2 insertions(+), 1 deletion(-) | 20 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 21 | 21 | ||
| 22 | diff --git git.orig/src/import/Makefile git.orig/src/import/Makefile | 22 | diff --git git.orig/Makefile git.orig/Makefile |
| 23 | index c61418e60..54a10eb42 100644 | 23 | index c61418e60..54a10eb42 100644 |
| 24 | --- git.orig/src/import/Makefile | 24 | --- git.orig/Makefile |
| 25 | +++ git.orig/src/import/Makefile | 25 | +++ git.orig/Makefile |
| 26 | @@ -112,7 +112,8 @@ endif | 26 | @@ -112,7 +112,8 @@ endif |
| 27 | GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n") | 27 | GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n") |
| 28 | 28 | ||
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch b/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch index f1dea5a4..b499de5d 100644 --- a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch +++ b/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch | |||
| @@ -13,10 +13,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | |||
| 13 | Makefile | 1 - | 13 | Makefile | 1 - |
| 14 | 1 file changed, 1 deletion(-) | 14 | 1 file changed, 1 deletion(-) |
| 15 | 15 | ||
| 16 | diff --git git.orig/src/import/Makefile git.orig/src/import/Makefile | 16 | diff --git git.orig/Makefile git.orig/Makefile |
| 17 | index 4a6c13042..debb57925 100644 | 17 | index 4a6c13042..debb57925 100644 |
| 18 | --- git.orig/src/import/Makefile | 18 | --- git.orig/Makefile |
| 19 | +++ git.orig/src/import/Makefile | 19 | +++ git.orig/Makefile |
| 20 | @@ -130,7 +130,6 @@ TESTFLAGS_RACE= | 20 | @@ -130,7 +130,6 @@ TESTFLAGS_RACE= |
| 21 | # See Golang issue re: '-trimpath': https://github.com/golang/go/issues/13809 | 21 | # See Golang issue re: '-trimpath': https://github.com/golang/go/issues/13809 |
| 22 | GO_GCFLAGS=$(shell \ | 22 | GO_GCFLAGS=$(shell \ |