From 5a4a676ec693b82b1c3b6857fe07c6c273ff12cc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 Jan 2021 16:01:47 -0800 Subject: [PATCH 1/2] docker: update to 20.10.2 Remove non MIPS depends as MIPS is supported now. Signed-off-by: Rosen Penev --- utils/docker/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/docker/Makefile b/utils/docker/Makefile index e419915ed..0d8af6dfd 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,20 +1,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=20.10.1 +PKG_VERSION:=20.10.2 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/docker/cli/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=4ee7cc9c3f6287ca834166aaa1a945790c54d9a8345a1b449a193d9c739f2a7d -PKG_SOURCE_VERSION:=562ea3c09c # SHA1 used within the docker executable +PKG_HASH:=a663f54a158c6b2b23b253b14bf0de56ff035750098e760319de1edb7f4ae76d +PKG_SOURCE_VERSION:=2291f61 # SHA1 used within the docker executable PKG_MAINTAINER:=Gerard Ryan PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 GO_PKG:=github.com/docker/cli @@ -26,7 +27,7 @@ define Package/docker CATEGORY:=Utilities TITLE:=Docker Community Edition CLI URL:=https://www.docker.com/ - DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) + DEPENDS:=$(GO_ARCH_DEPENDS) endef define Package/docker/description From b99c73adde5390ab802ad7fbe8f6ec652fddf64e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 Jan 2021 16:12:47 -0800 Subject: [PATCH 2/2] dockerd: update to 20.10.2 Remove non MIPS depends as MIPS is supported now. Signed-off-by: Rosen Penev --- utils/dockerd/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index aeb9dbfe7..60feb3f75 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,20 +1,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=20.10.1 +PKG_VERSION:=20.10.2 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/moby/moby/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f0fda46a82bf8f624eb349370358891d3bc65ef3e320675226f17dba8f62566d -PKG_SOURCE_VERSION:=cdd80e813e # SHA1 used within the docker executables +PKG_HASH:=dc4818f0cba2ded2f6f7420a1fda027ddbf6c6c9fe319f84d1311bfe610447ca +PKG_SOURCE_VERSION:=8891c58 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 GO_PKG:=github.com/docker/docker @@ -30,7 +31,7 @@ define Package/dockerd CATEGORY:=Utilities TITLE:=Docker Community Edition Daemon URL:=https://www.docker.com/ - DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +btrfs-progs +ca-certificates +containerd +libdevmapper +libnetwork +tini \ + DEPENDS:=$(GO_ARCH_DEPENDS) +btrfs-progs +ca-certificates +containerd +libdevmapper +libnetwork +tini \ +KERNEL_SECCOMP:libseccomp +iptables-mod-extra +kmod-br-netfilter +kmod-ikconfig +kmod-nf-conntrack-netlink +kmod-nf-ipvs \ +kmod-nf-nat +kmod-veth USERID:=docker:docker