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 | 4 |
2 files changed, 7 insertions, 7 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 29e0367b..826011c5 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 | |||
| @@ -35,11 +35,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | |||
| 35 | src/import/Makefile | 3 ++- | 35 | src/import/Makefile | 3 ++- |
| 36 | 1 file changed, 2 insertions(+), 1 deletion(-) | 36 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 37 | 37 | ||
| 38 | Index: cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile | 38 | Index: cri-tools-1.36.0+git/src/import/Makefile |
| 39 | =================================================================== | 39 | =================================================================== |
| 40 | --- cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351.orig/src/import/Makefile | 40 | --- cri-tools-1.36.0+git.orig/src/import/Makefile |
| 41 | +++ cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile | 41 | +++ cri-tools-1.36.0+git/src/import/Makefile |
| 42 | @@ -74,7 +74,8 @@ | 42 | @@ -123,7 +123,8 @@ crictl: ## Build the crictl binary. |
| 43 | @$(MAKE) -B $(CRICTL) | 43 | @$(MAKE) -B $(CRICTL) |
| 44 | 44 | ||
| 45 | $(CRICTL): | 45 | $(CRICTL): |
| @@ -47,5 +47,5 @@ Index: cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/M | |||
| 47 | + $(GO_BUILD) -o $@ \ | 47 | + $(GO_BUILD) -o $@ \ |
| 48 | + -a -pkgdir dontusecurrentpkgs \ | 48 | + -a -pkgdir dontusecurrentpkgs \ |
| 49 | -ldflags '$(GO_LDFLAGS)' \ | 49 | -ldflags '$(GO_LDFLAGS)' \ |
| 50 | $(GOFLAGS) \ | ||
| 51 | $(PROJECT)/cmd/crictl | 50 | $(PROJECT)/cmd/crictl |
| 51 | |||
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb index b2706311..b4e79a07 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 = "16d5673873fda6d333f8411778a35f5778998680" | 19 | SRCREV_cri-tools = "5b24423f01280a50667d95affa1df39c4f5f5aa0" |
| 20 | SRC_URI = "\ | 20 | SRC_URI = "\ |
| 21 | git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ | 21 | git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
| 22 | file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \ | 22 | file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \ |
| @@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2 | |||
| 27 | 27 | ||
| 28 | GO_IMPORT = "import" | 28 | GO_IMPORT = "import" |
| 29 | 29 | ||
| 30 | PV = "1.35.0+git" | 30 | PV = "1.36.0+git" |
| 31 | 31 | ||
| 32 | RPROVIDES:${PN} += "crictl" | 32 | RPROVIDES:${PN} += "crictl" |
| 33 | PACKAGES =+ "${PN}-critest" | 33 | PACKAGES =+ "${PN}-critest" |
