From: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Date: Mon, 16 May 2022 11:51:30 +0000 (+1000)
Subject: containerd: Update to v1.6.4 for docker v20.10.16
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9a7e3c0b7bdcefe5e9c97e0f8ec17bc4f97b9251;p=feed%2Fpackages.git

containerd: Update to v1.6.4 for docker v20.10.16
* Overrode `PREFIX` to have the old behaviour

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
---

diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile
index e1d99455fe..8ddfa1a941 100644
--- a/utils/containerd/Makefile
+++ b/utils/containerd/Makefile
@@ -1,15 +1,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=containerd
-PKG_VERSION:=1.5.11
+PKG_VERSION:=1.6.4
 PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6
-PKG_SOURCE_VERSION:=3df54a852345ae127d1fa3092b95168e4a88e2f8
+PKG_HASH:=f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
 
@@ -42,7 +41,8 @@ MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
 MAKE_VARS += $(GO_PKG_VARS)
 MAKE_FLAGS += \
 	VERSION=$(PKG_VERSION) \
-	REVISION=$(PKG_SOURCE_VERSION)
+	REVISION=$(PKG_SOURCE_VERSION) \
+	PREFIX=""
 
 ifeq ($(CONFIG_SELINUX),y)
 MAKE_FLAGS += BUILDTAGS='selinux'