From e97da8ceadffd26d247ea8e5aa1f73e24afba1e7 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 27 Jun 2024 13:54:34 +0800 Subject: [PATCH 1/2] cni-plugins-nft: fix dependence with OpenWrt v19.07 --- utils/cni-plugins-nft/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/cni-plugins-nft/Makefile b/utils/cni-plugins-nft/Makefile index f00b0e16..f3c11a84 100644 --- a/utils/cni-plugins-nft/Makefile +++ b/utils/cni-plugins-nft/Makefile @@ -30,7 +30,7 @@ define Package/cni-plugins-nft CATEGORY:=Utilities TITLE:=CNI Plugins compatible with nftables URL:=https://github.com/greenpau/cni-plugins/ - DEPENDS:=$(GO_ARCH_DEPENDS) +nftables + DEPENDS:=$(GO_ARCH_DEPENDS) endef define Package/cni-plugins-nft/description From d647e108d63367a65a42bda305b323485d97361c Mon Sep 17 00:00:00 2001 From: uparrows <38988286+uparrows@users.noreply.github.com> Date: Sat, 29 Jun 2024 18:01:45 +0800 Subject: [PATCH 2/2] docker: update all packages to 27.0.2 (#832) --- utils/containerd/Makefile | 4 ++-- utils/docker-compose/Makefile | 4 ++-- utils/docker/Makefile | 6 +++--- utils/dockerd/Makefile | 6 +++--- utils/runc/Makefile | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index 7a2b67b8..31e62551 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.7.15 +PKG_VERSION:=1.7.18 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:=2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 +PKG_HASH:=91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 PKG_MAINTAINER:=Gerard Ryan diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index f42d1af2..65bd3fcc 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.27.0 +PKG_VERSION:=2.28.1 PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=29b2232d1609dff03db74188a7944c85ba8b612f47a7e39938a43db8fb7d7067 +PKG_HASH:=856f1b509ef7190fedadec369e290bfb08c2fafb4f858b80a27caf350554fb50 PKG_MAINTAINER:=Javier Marcet diff --git a/utils/docker/Makefile b/utils/docker/Makefile index 74a4b052..7468d05d 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker -PKG_VERSION:=26.1.1 +PKG_VERSION:=27.0.2 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/docker/cli PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=d28ecafe22a1051b9e78321047e90dd636db4310a388e7681ac144edbf178561 -PKG_GIT_SHORT_COMMIT:=4cf5afa # SHA1 used within the docker executables +PKG_HASH:=a2b31d4c8143c8b126e98a359639f51727fc83fc1e61670efbdeaa7dea92fd5a +PKG_GIT_SHORT_COMMIT:=912c1dd # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 51abdbe1..83987614 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=26.1.1 +PKG_VERSION:=27.0.2 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -10,8 +10,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_GIT_URL:=github.com/moby/moby PKG_GIT_REF:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? -PKG_HASH:=d0b3b2083d1ef5144092c89bcf28519fa3cdab3ab6bfb3a6499ec5cf05961c2c -PKG_GIT_SHORT_COMMIT:=ac2de55 # SHA1 used within the docker executables +PKG_HASH:=2705abdd7a8a47ec88c0d2f0f31eede01ba4aa5ae8b5ab0e2c4ee25e7c314521 +PKG_GIT_SHORT_COMMIT:=e953d76 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 7a125962..b678bd93 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc -PKG_VERSION:=1.1.12 +PKG_VERSION:=1.1.13 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/opencontainers/runc/tar.gz/v${PKG_VERSION}? -PKG_HASH:=be31b07d6a54a8f234016501c300ad04b6c428c56588e7eca8c3b663308db208 +PKG_HASH:=789d5749a08ef1fbe5d1999b67883206a68a4e58e6ca0151c411d678f3480b25 PKG_MAINTAINER:=Gerard Ryan