summaryrefslogtreecommitdiffstats
path: root/recipes-containers
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-02-15 20:05:43 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-02-15 20:10:36 +0000
commit8c1284f9212ccf7722d0ab701486f7d3adedd06e (patch)
tree063b4971e2890ab51deba27a2ad3db88adf88e57 /recipes-containers
parentb513fda51969eaad61b6cb4625e4b4a75b55d537 (diff)
downloadmeta-virtualization-8c1284f9212ccf7722d0ab701486f7d3adedd06e.tar.gz
containerd: update to v1.2.4
Updating containerd to 1.2.4 (and switching to the release branch for our git hash). The following commits are in this update: e6b3f563 Merge pull request #3002 from estesp/prepare-1.2.4-release 5d1443dc Prepare v1.2.4 release 2095626c Merge pull request #3014 from thaJeztah/1.2_bump_cri 78286104 Merge pull request #3013 from thaJeztah/1.2_backport_windows_changes 3cbdf9e4 [release/1.2] update containerd/cri to da0c016c830b2ea97fd1d737c49a568a816bf964 dfa19e59 Windows:NewDirectIOFromFIFOSet 84a14ae0 Update runhcs options to include CRI Sandbox support 6a8198b0 Forward ctr.exe --debug as io.containerd.runhcs.v1 options d40cc95f Implement io.containerd.runhcs.v1 shim log opts 30ca1c55 Add io.containerd.runhcs.v1 shim proto options 7908802c Fix Makefile to run protobuild on paths with spaces 583472f6 Merge pull request #2998 from thaJeztah/1.2_backport_bump_runc_cve_2019-5736 b4bf3e34 Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736) 74133fa4 Merge pull request #2995 from thaJeztah/1.2_backport_remove_normalize_image_ref ed756ffd Use distribution's reference.ParseDockerRef 2fb38236 Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580 7f5f1176 Merge pull request #2974 from ehazlett/release-v1.2.3 7216861d Update for 1.2.3 release 5de147d9 Merge pull request #2984 from Random-Liu/update-cri-release-1.2 f7ac34e3 Update cri plugin to c3cf754321fc38c6af5dfd2552fdde0ad192b31d. 0137339c Merge pull request #2977 from crosbymichael/io-panic 7daf0804 Fix potential containerd panic. 2fd20f11 Merge pull request #2972 from crosbymichael/exec-lock 5730c500 Add a separate lock for pid. b9b7ef32 Revert "use state machine management for exec.Pid()" dba2e5e5 Merge pull request #2965 from fuweid/remove-noop 9b6a318a metadata/gc: remove the noop-loop for snapshot reference d86a73a4 Merge pull request #2946 from fuweid/platformruntime dd29d5c3 Merge pull request #2947 from fuweid/pull-oct a0b4da71 bugfix: support application/octet-stream during pull b4d38c0f runtime: add Add/Delete method in PlatformRuntime interface af900154 Merge pull request #2955 from Random-Liu/cherrypick-#2944-release-1.2 ab2cf013 Use context.Background for `O_NONBLOCK` `OpenFifo`. fa60b5be Merge pull request #2953 from thaJeztah/1.2_backport_fix_xattr 2244a20c fix: SCHILY.xattrs should be SCHILY.xattr 8c9ede4f Merge pull request #2950 from crosbymichael/lint-release bf3c932a [release 1.2] fix: linter issue 5c38d942 Merge pull request #2932 from AkihiroSuda/runc20190115-1.2 32f10c77 bump up runc 97548718 Merge pull request #2917 from dmcgowan/release-1.2.2 ef637041 Update for 1.2.2 release 4bb2b0c3 Merge pull request #2912 from Random-Liu/update-cri-release-1.2 f30fd023 Update cri to 0d5cabd006cb5319dc965046067b8432d9fa5ef8 (branch release/1.2). 46e63338 Merge pull request #2893 from thaJeztah/1.2_revert_temp_golang_fix e71a191f Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)" aa5e000c Merge pull request #2878 from andrewhsu/backport-1.2-fifo-timeout 31be8649 Merge pull request #2881 from thaJeztah/1.2_backport_fix_ci_golang_1.11 27c6449c Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround) 18f57e20 Add timeout and cancel to shim fifo open 9b32062d Merge pull request #2852 from dmcgowan/prepare-1.2.1 51134077 Update version to 1.2.1 dcc47ddd Merge pull request #2861 from dmcgowan/cherrypick-1.2-2857 4c327b8e Update runc to 96ec2177ae841256168fcf76954f7177af b65a1137 Merge pull request #2860 from Random-Liu/update-cri-release-1.2 18e453e4 Update release note. 586807a8 Update cri plugin to 0ca1e3c2b73b5c38e72f29bb76338d0078b23d6c. 4b284fa3 Merge pull request #2856 from Random-Liu/cherrypick-#2854-release-1.2 b413e843 Kill should still work in stopped state. a06cddc2 Merge pull request #2845 from nnttmm/backport_2826 176a5621 Merge pull request #2842 from thaJeztah/1.2_backport_update_runc_1.0-rc6 8dc87dd8 Merge pull request #2847 from thaJeztah/1.2_backport_mask_asound 703786c5 Add /proc/asound to masked paths c42c8952 use state machine management for exec.Pid() 93d5b4b0 Update runc to v1.0.0-rc6 de1f167a Merge pull request #2819 from dmcgowan/prepare-1.2.1-rc 27d72ba7 Update version e3840cce Add 1.2.1 release notes 940c0c06 Merge pull request #2817 from Random-Liu/cherrypick-2811-release-1.2 4598ec21 Lock `KillAll`. e429785c Merge pull request #2815 from thaJeztah/1.2_backport_shimlockwhenstdinclose 9be591e4 Merge pull request #2803 from crosbymichael/cherry-proc-lock 309973ed Merge pull request #2801 from crosbymichael/cherry-runc e4c49d70 Update runc to 10d38b660a77168360df3522881e2dc2be cd83a4e0 fix pipe in broken may cause shim lock forever for runtime v1 275f99fe fix pipe in broken may cause shim lock forever for runtime v2 39cd8634 Merge pull request #2795 from estesp/cherrypick-optimize-shim-lock 3afc3f14 Merge pull request #2796 from estesp/cherrypick-exit-ch-buffers f9323ca9 Revert v2 dropped events 4c72befe Fix process locking and state management 14dc3078 Partially revert the event discard change in #2748. 417d6941 Increase reaper buffer size and non-blocking send 7ef5285b optimize shim lock in runtime v1 040e73fd Merge pull request #2792 from estesp/cherrypick-update-hcsshim-vendor c4a256d3 Merge pull request #2790 from estesp/cherrypick-v1v2-runtime-fix 73758765 Temp: add appveyor enablement for release/1.2 branch 090e3e98 Revendor github.com/Microsoft/hcsshim 046b6c6d enhance: update v1/v2 runtime 7ff9f681 Merge pull request #2784 from Random-Liu/update-cri-release-1.2 54895c0b Update cri to 2bb57d27203d82fc79c496aea724aec593b2705a. cd0ecb78 Merge pull request #2779 from thaJeztah/1.2_backport_ignore_modprobe_failures c4acd17e Ignore modprobe failures in ExecStartPre (systemd unit) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r--recipes-containers/containerd/containerd-opencontainers_git.bb6
-rw-r--r--recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch17
2 files changed, 10 insertions, 13 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 7755f7db..2c691b59 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -1,5 +1,5 @@
1SRCREV = "0190e5f3900227fc739afbc8f4a03df968dc337b" 1SRCREV = "e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e"
2SRC_URI = "git://github.com/containerd/containerd;nobranch=1 \ 2SRC_URI = "git://github.com/containerd/containerd;branch=release/1.2 \
3 file://0001-build-use-oe-provided-GO-and-flags.patch \ 3 file://0001-build-use-oe-provided-GO-and-flags.patch \
4 " 4 "
5 5
@@ -7,7 +7,7 @@ include containerd.inc
7 7
8LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" 8LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89"
9 9
10CONTAINERD_VERSION = "v1.2.0" 10CONTAINERD_VERSION = "v1.2.4"
11 11
12PROVIDES += "virtual/containerd" 12PROVIDES += "virtual/containerd"
13RPROVIDES_${PN} = "virtual/containerd" 13RPROVIDES_${PN} = "virtual/containerd"
diff --git a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
index c2433f14..d4d5973e 100644
--- a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
+++ b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
@@ -12,16 +12,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
12 Makefile | 8 ++++---- 12 Makefile | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-) 13 1 file changed, 4 insertions(+), 4 deletions(-)
14 14
15diff --git a/src/import/Makefile b/src/import/Makefile 15Index: git/src/import/Makefile
16index 8e680133..fd7d2813 100644 16===================================================================
17--- a/src/import/Makefile 17--- git.orig/src/import/Makefile
18+++ b/src/import/Makefile 18+++ git/src/import/Makefile
19@@ -179,19 +179,19 @@ FORCE: 19@@ -166,19 +166,19 @@
20 # Build a binary from a cmd. 20 # Build a binary from a cmd.
21 bin/%: cmd/% FORCE 21 bin/%: cmd/% FORCE
22 @echo "$(WHALE) $@${BINARY_SUFFIX}" 22 @echo "$(WHALE) $@${BINARY_SUFFIX}"
23- @go build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< 23- @go build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$<
24+ @$(GO) build ${GO_BUILD_FLAGS} ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< 24+ @$(GO) build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$<
25 25
26 bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 26 bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
27 @echo "$(WHALE) bin/containerd-shim" 27 @echo "$(WHALE) bin/containerd-shim"
@@ -40,6 +40,3 @@ index 8e680133..fd7d2813 100644
40 40
41 binaries: $(BINARIES) ## build binaries 41 binaries: $(BINARIES) ## build binaries
42 @echo "$(WHALE) $@" 42 @echo "$(WHALE) $@"
43--
442.19.1
45
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 02:40:31 +0000