From 9d3c3350a6c3a3774d99529cb6ad813660e3947f Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Tue, 6 Jun 2023 20:23:07 +1000 Subject: [PATCH] dockerd: Update to 24.0.2 Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 6 +++--- utils/dockerd/patches/001-libdevmapper_name_fix.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 80cdf0531c..bddf583273 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=23.0.1 +PKG_VERSION:=24.0.2 PKG_RELEASE:=1 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:=c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56 -PKG_GIT_SHORT_COMMIT:=bc3805a # SHA1 used within the docker executables +PKG_HASH:=f4bc7d7cc2ee3671371ae80fd624e61f0598e614b5c235012581f8ec1d593aa0 +PKG_GIT_SHORT_COMMIT:=659604f # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan diff --git a/utils/dockerd/patches/001-libdevmapper_name_fix.patch b/utils/dockerd/patches/001-libdevmapper_name_fix.patch index ec3fc649f9..8070090d40 100644 --- a/utils/dockerd/patches/001-libdevmapper_name_fix.patch +++ b/utils/dockerd/patches/001-libdevmapper_name_fix.patch @@ -1,6 +1,6 @@ --- a/hack/make.sh +++ b/hack/make.sh -@@ -100,7 +100,7 @@ fi +@@ -98,7 +98,7 @@ fi # functionality. We favour libdm_dlsym_deferred_remove over # libdm_no_deferred_remove in dynamic cases because the binary could be shipped # with a newer libdevmapper than the one it was built with.