diff options
-rw-r--r-- | recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch | 10 | ||||
-rw-r--r-- | recipes-containers/cri-tools/cri-tools_git.bb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch index afd7c4bf..189d905a 100644 --- a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch +++ b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch | |||
@@ -33,11 +33,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | |||
33 | src/import/Makefile | 3 ++- | 33 | src/import/Makefile | 3 ++- |
34 | 1 file changed, 2 insertions(+), 1 deletion(-) | 34 | 1 file changed, 2 insertions(+), 1 deletion(-) |
35 | 35 | ||
36 | Index: cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile | 36 | Index: cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile |
37 | =================================================================== | 37 | =================================================================== |
38 | --- cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54.orig/src/import/Makefile | 38 | --- cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa.orig/src/import/Makefile |
39 | +++ cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile | 39 | +++ cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile |
40 | @@ -73,7 +73,8 @@ | 40 | @@ -74,7 +74,8 @@ |
41 | @$(MAKE) -B $(CRICTL) | 41 | @$(MAKE) -B $(CRICTL) |
42 | 42 | ||
43 | $(CRICTL): | 43 | $(CRICTL): |
@@ -45,5 +45,5 @@ Index: cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/M | |||
45 | + $(GO_BUILD) -o $@ \ | 45 | + $(GO_BUILD) -o $@ \ |
46 | + -a -pkgdir dontusecurrentpkgs \ | 46 | + -a -pkgdir dontusecurrentpkgs \ |
47 | -ldflags '$(GO_LDFLAGS)' \ | 47 | -ldflags '$(GO_LDFLAGS)' \ |
48 | -trimpath \ | ||
48 | -tags '$(BUILDTAGS)' \ | 49 | -tags '$(BUILDTAGS)' \ |
49 | $(PROJECT)/cmd/crictl | ||
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb index ad054e1c..f87ca19d 100644 --- a/recipes-containers/cri-tools/cri-tools_git.bb +++ b/recipes-containers/cri-tools/cri-tools_git.bb | |||
@@ -16,7 +16,7 @@ What is not in scope for this project? \ | |||
16 | non-exist on the kube-apiserver. \ | 16 | non-exist on the kube-apiserver. \ |
17 | " | 17 | " |
18 | 18 | ||
19 | SRCREV_cri-tools = "fa50f4af0f6beba20264bfb3fd4d1d34e42f7b54" | 19 | SRCREV_cri-tools = "de32df077e6b0e9e31ce367dfc34c1b6b46e30fa" |
20 | SRC_URI = "\ | 20 | SRC_URI = "\ |
21 | git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools \ | 21 | git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools \ |
22 | file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \ | 22 | file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \ |