jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-27 23:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update containerd to 1.2.0 (#260)" (#261)

Browse Source 
This reverts commit 50bc0451d0b83e37b83de590a77f16c797e09a51.
This commit is contained in:
Pascal Vizeli 2018-11-27 00:06:46 +01:00 committed by GitHub
parent 50bc0451d0
commit d46e2a808f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
buildroot-patches/0001-docker-containerd-bump-to-v1.2.0.patch → buildroot-patches/0001-docker-containerd-bump-to-v1.1.5.patch
View File

@ -1,7 +1,7 @@
From 0484ba124482874b9612563887b22ce454026f7e Mon Sep 17 00:00:00 2001 From 92e66c5811921fa7e16a07abe94ba3e82afedfbe Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch> From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 26 Nov 2018 14:38:19 +0000 Date: Sun, 25 Nov 2018 15:37:10 +0000
Subject: [PATCH 1/1] docker-containerd: bump to v1.2.0 Subject: [PATCH 1/1] docker-containerd: bump to v1.1.5
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
--- ---
@ -10,16 +10,16 @@ Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
2 files changed, 3 insertions(+), 2 deletions(-) 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index a530873..71cd5e5 100644 index a530873..0ab32df 100644
--- a/package/docker-containerd/docker-containerd.hash --- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
# Computed locally # Computed locally
-sha256 a946f4614d92d60361213ef18deab04ee73599e4567f1ff26f7a72841afe4fa2 docker-containerd-v1.1.3.tar.gz -sha256 a946f4614d92d60361213ef18deab04ee73599e4567f1ff26f7a72841afe4fa2 docker-containerd-v1.1.3.tar.gz
+sha256 8565a655345f3db2f7b78b77a2cd3103895229aa44cd0e4c710ba3559e344b5a docker-containerd-v1.2.0.tar.gz +sha256 e0d6a92493c875741077c45684a094d61c032e6249454298f652b81e0b148f40 docker-containerd-v1.1.5.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 121ef09..36f4a25 100644 index 121ef09..9ee4fd3 100644
--- a/package/docker-containerd/docker-containerd.mk --- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
@ -27,7 +27,7 @@ index 121ef09..36f4a25 100644
################################################################################ ################################################################################
-DOCKER_CONTAINERD_VERSION = v1.1.3 -DOCKER_CONTAINERD_VERSION = v1.1.3
+DOCKER_CONTAINERD_VERSION = v1.2.0 +DOCKER_CONTAINERD_VERSION = v1.1.5
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE DOCKER_CONTAINERD_LICENSE_FILES = LICENSE

2
buildroot/package/docker-containerd/docker-containerd.hash
View File

@ -1,3 +1,3 @@
# Computed locally # Computed locally
sha256 8565a655345f3db2f7b78b77a2cd3103895229aa44cd0e4c710ba3559e344b5a docker-containerd-v1.2.0.tar.gz sha256 e0d6a92493c875741077c45684a094d61c032e6249454298f652b81e0b148f40 docker-containerd-v1.1.5.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE

2
buildroot/package/docker-containerd/docker-containerd.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
DOCKER_CONTAINERD_VERSION = v1.2.0 DOCKER_CONTAINERD_VERSION = v1.1.5
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE DOCKER_CONTAINERD_LICENSE_FILES = LICENSE