diff options
| -rw-r--r-- | utils/dockerd/Makefile | 8 | ||||
| -rw-r--r-- | utils/dockerd/patches/001-libdevmapper_name_fix.patch | 11 |
2 files changed, 4 insertions, 15 deletions
diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 99da8bbc8..5c2d545e9 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd -PKG_VERSION:=24.0.7 -PKG_RELEASE:=2 +PKG_VERSION:=25.0.3 +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:=16a2cb4cf4d314a070085e0df06e3a6bd9ec678d28715b64060af694fc9051d5 -PKG_GIT_SHORT_COMMIT:=311b9ff # SHA1 used within the docker executables +PKG_HASH:=4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590 +PKG_GIT_SHORT_COMMIT:=f417435 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> diff --git a/utils/dockerd/patches/001-libdevmapper_name_fix.patch b/utils/dockerd/patches/001-libdevmapper_name_fix.patch deleted file mode 100644 index 8070090d4..000000000 --- a/utils/dockerd/patches/001-libdevmapper_name_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hack/make.sh -+++ b/hack/make.sh -@@ -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. --if command -v gcc &> /dev/null && ! (echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(${PKG_CONFIG} --libs devmapper 2> /dev/null) &> /dev/null); then -+if command -v gcc &> /dev/null && ! (echo -e '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(${PKG_CONFIG} --libs libdevmapper 2> /dev/null) &> /dev/null); then - add_buildtag libdm dlsym_deferred_remove - fi - |