diff options
-rw-r--r-- | recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch | 17 | ||||
-rw-r--r-- | recipes-containers/cri-tools/cri-tools_git.bb | 4 |
2 files changed, 9 insertions, 12 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 19b48b71..29e0367b 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,20 +35,17 @@ 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 | diff --git a/src/import/Makefile b/src/import/Makefile | 38 | Index: cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile |
39 | index 7c5b30ec..9b0dfeaf 100644 | 39 | =================================================================== |
40 | --- a/src/import/Makefile | 40 | --- cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351.orig/src/import/Makefile |
41 | +++ b/src/import/Makefile | 41 | +++ cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile |
42 | @@ -72,7 +72,8 @@ crictl: | 42 | @@ -74,7 +74,8 @@ |
43 | @$(MAKE) -B $(CRICTL) | 43 | @$(MAKE) -B $(CRICTL) |
44 | 44 | ||
45 | $(CRICTL): | 45 | $(CRICTL): |
46 | - CGO_ENABLED=0 $(GO_BUILD) -o $@ \ | 46 | - CGO_ENABLED=$(CGO_ENABLED) $(GO_BUILD) -o $@ \ |
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 | -trimpath \ | 50 | $(GOFLAGS) \ |
51 | $(PROJECT)/cmd/crictl | 51 | $(PROJECT)/cmd/crictl |
52 | -- | ||
53 | 2.19.1 | ||
54 | |||
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb index af88998a..77c2f47c 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 = "4daea44918cc34b63617c6c9e9923f43d47ddfdd" | 19 | SRCREV_cri-tools = "e73a7139ed4986d6a0db784ae7a036841a02b351" |
20 | SRC_URI = "\ | 20 | SRC_URI = "\ |
21 | git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \ | 21 | git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \ |
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.26.1+git${SRCREV_cri-tools}" | 30 | PV = "1.27.0+git${SRCREV_cri-tools}" |
31 | 31 | ||
32 | RPROVIDES:${PN} += "crictl" | 32 | RPROVIDES:${PN} += "crictl" |
33 | PACKAGES =+ "${PN}-critest" | 33 | PACKAGES =+ "${PN}-critest" |