Containerd: Upgrading to v1.4.0
Upgrade containerd package to v1.4.0
BUG=b/165032411
TEST=emerge-lakitu containerd
RELEASE_NOTE=upgrade containerd to v1.4.0
Change-Id: I6bcecdf01bfd2c5ab1469411b9c76f7389dcef3b
diff --git a/overlay-lakitu/app-emulation/containerd/Manifest b/overlay-lakitu/app-emulation/containerd/Manifest
index cf4075d..d4e41a5 100644
--- a/overlay-lakitu/app-emulation/containerd/Manifest
+++ b/overlay-lakitu/app-emulation/containerd/Manifest
@@ -1 +1 @@
-DIST containerd-1.4.0_rc0.tar.gz 6073516 BLAKE2B 8d5ce4499e2520666abba6868796d390e17b13782c00966a64b8b6f3d5db0068485077f99033f86f015c6cbfadf8ef2d496e6010d258bd2c20b551a13cbf68dd SHA512 df50f6a73a4926bac975d3e2e665535edf8b813298bfeaaae95b8e721525c72a48ccb6ee4b623db1109110427f7065a650b4e2935c18153e5d707d83ac3be745
+DIST containerd-1.4.0.tar.gz 6165201 BLAKE2B d90d03fea9992827ac31e3b438d1891d50103c01387d4b5e66506ad72509e3f0ca97ca096384ec76843fc49c49684e139107914db486f3ec1aae023ceb5dd2cc SHA512 5ac733a0823f5b680d40f76cb5a8277e84efdd6642d15c1735049f8859bf9f87b212b4075bdc13e8f09a5564b55ce74d7d1290628b0ca92d9753ef9bfa9a0e44
diff --git a/overlay-lakitu/app-emulation/containerd/containerd-1.4.0-r1.ebuild b/overlay-lakitu/app-emulation/containerd/containerd-1.4.0-r1.ebuild
new file mode 120000
index 0000000..8578240
--- /dev/null
+++ b/overlay-lakitu/app-emulation/containerd/containerd-1.4.0-r1.ebuild
@@ -0,0 +1 @@
+containerd-1.4.0.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/app-emulation/containerd/containerd-1.4.0_rc0.ebuild b/overlay-lakitu/app-emulation/containerd/containerd-1.4.0.ebuild
similarity index 97%
rename from overlay-lakitu/app-emulation/containerd/containerd-1.4.0_rc0.ebuild
rename to overlay-lakitu/app-emulation/containerd/containerd-1.4.0.ebuild
index a0149dc..9bf9811 100644
--- a/overlay-lakitu/app-emulation/containerd/containerd-1.4.0_rc0.ebuild
+++ b/overlay-lakitu/app-emulation/containerd/containerd-1.4.0.ebuild
@@ -12,7 +12,7 @@
else
MY_PV="${PV/_rc/-rc.}"
EGIT_COMMIT="v${MY_PV}"
- CONTAINERD_COMMIT="85b15eff4581d7e5e3bccb40fdd4f35b6946f545"
+ CONTAINERD_COMMIT="09814d48d50816305a8e6c1a4ae3e2bcc4ba725a"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="*"
inherit golang-vcs-snapshot
diff --git a/overlay-lakitu/app-emulation/containerd/containerd-1.4.0_rc0-r1.ebuild b/overlay-lakitu/app-emulation/containerd/containerd-1.4.0_rc0-r1.ebuild
deleted file mode 120000
index b4bef80..0000000
--- a/overlay-lakitu/app-emulation/containerd/containerd-1.4.0_rc0-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-containerd-1.4.0_rc0.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/app-emulation/containerd/files/1.4.0-customize-containerd-service.patch b/overlay-lakitu/app-emulation/containerd/files/1.4.0-customize-containerd-service.patch
index 5016ac7..31fcf26 100644
--- a/overlay-lakitu/app-emulation/containerd/files/1.4.0-customize-containerd-service.patch
+++ b/overlay-lakitu/app-emulation/containerd/files/1.4.0-customize-containerd-service.patch
@@ -1,17 +1,8 @@
-From 8d4bffa5708bdb38787e3e7cda36a4f3c26a3bb0 Mon Sep 17 00:00:00 2001
-From: Vaibhav Rustagi <vaibhavrustagi@google.com>
-Date: Fri, 17 Apr 2020 12:10:40 -0700
-Subject: [PATCH 2/2] customize-containerd-service
-
----
- containerd.service | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
diff --git a/containerd.service b/containerd.service
-index cae30ec7..f345d4f2 100644
+index d0f3be7..7bcc985 100644
--- a/containerd.service
+++ b/containerd.service
-@@ -5,12 +5,14 @@ After=network.target local-fs.target
+@@ -19,7 +19,7 @@ After=network.target local-fs.target
[Service]
ExecStartPre=-/sbin/modprobe overlay
@@ -20,13 +11,3 @@
Type=notify
Delegate=yes
- KillMode=process
-+OOMScoreAdjust=-999
- Restart=always
-+RestartSec=10
- # Having non-zero Limit*s causes performance problems due to accounting overhead
- # in the kernel. We recommend using cgroups to do container-local accounting.
- LimitNPROC=infinity
---
-2.27.0.212.ge8ba1cc988-goog
-
