docker: bump to 29.4.1

Fix build issues and disable building for all MIPS variants.

Changes: https://docs.docker.com/engine/release-notes/27/
Changes: https://docs.docker.com/engine/release-notes/28/
Changes: https://docs.docker.com/engine/release-notes/29/#2941
Signed-off-by: George Sapkin <redacted>

diff --git a/utils/docker/Makefile b/utils/docker/Makefile
index a73817c69523c7bad411649c68caea814d99a13b..42c57c58c4f3245ac4e9c06c6820f513f57c8893 100644 (file)
--- a/utils/docker/Makefile
+++ b/utils/docker/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docker
-PKG_VERSION:=27.3.1
-PKG_RELEASE:=2
+PKG_VERSION:=29.4.1
+PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -10,30 +10,33 @@ 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:=df7d44387166d90954e290dfbe0a278649bf71d0e89933615bdc0757580b68e4
-PKG_GIT_SHORT_COMMIT:=ce12230 # SHA1 used within the docker executables
+PKG_HASH:=b45d935ab8f5faff8b0a03eb6c5c658636f47bc8170d892152b8eb57f5931315
+PKG_GIT_SHORT_COMMIT:=055a478 # SHA1 used within the docker executables
 
 PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
 
 PKG_BUILD_DEPENDS:=golang/host dockerd
 PKG_BUILD_PARALLEL:=1
-PKG_BUILD_FLAGS:=no-mips16
 
 GO_PKG:=$(PKG_GIT_URL)
 
 include $(INCLUDE_DIR)/package.mk
 include ../../lang/golang/golang-package.mk
 
+EMPTY:=
+SPACE:= $(EMPTY) $(EMPTY)
+ARCH_DEPENDS:=@($(subst $(SPACE),||,$(strip $(filter-out mips mips64 mipsel mips64el,$(subst ||,$(SPACE),$(patsubst @(%),%,$(GO_ARCH_DEPENDS)))))))
+
 define Package/docker
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Docker Community Edition CLI
   URL:=https://www.docker.com/
-  DEPENDS:=$(GO_ARCH_DEPENDS)
+  DEPENDS:=$(ARCH_DEPENDS)
 endef
 
 define Package/docker/description
-The CLI used in the Docker CE and Docker EE products.
+  The CLI used in the Docker CE and Docker EE products.
 endef
 
 GO_PKG_INSTALL_EXTRA:=\
@@ -44,27 +47,24 @@ TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
 TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
 TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lc -lgcc_eh)
 
+# Verify PKG_GIT_SHORT_COMMIT
 define Build/Prepare
        $(Build/Prepare/Default)
 
-       # Verify PKG_GIT_SHORT_COMMIT
-       ( \
-               EXPECTED_PKG_GIT_SHORT_COMMIT=$$$$( $(CURDIR)/../dockerd/git-short-commit.sh '$(PKG_GIT_URL)' '$(PKG_GIT_REF)' '$(TMP_DIR)/git-short-commit/$(PKG_NAME)-$(PKG_VERSION)' ); \
-               if [ "$$$${EXPECTED_PKG_GIT_SHORT_COMMIT}" != "$(strip $(PKG_GIT_SHORT_COMMIT))" ]; then \
-                       echo "ERROR: Expected 'PKG_GIT_SHORT_COMMIT:=$$$${EXPECTED_PKG_GIT_SHORT_COMMIT}', found 'PKG_GIT_SHORT_COMMIT:=$(strip $(PKG_GIT_SHORT_COMMIT))'"; \
-                       exit 1; \
-               fi \
-       )
+       EXPECTED_PKG_GIT_SHORT_COMMIT=$$$$( $(CURDIR)/../dockerd/git-short-commit.sh '$(PKG_GIT_URL)' '$(PKG_GIT_REF)' '$(TMP_DIR)/git-short-commit/$(PKG_NAME)-$(PKG_VERSION)' ); \
+       if [ "$$$${EXPECTED_PKG_GIT_SHORT_COMMIT}" != "$(strip $(PKG_GIT_SHORT_COMMIT))" ]; then \
+               echo "ERROR: Expected 'PKG_GIT_SHORT_COMMIT:=$$$${EXPECTED_PKG_GIT_SHORT_COMMIT}', found 'PKG_GIT_SHORT_COMMIT:=$(strip $(PKG_GIT_SHORT_COMMIT))'"; \
+               exit 1; \
+       fi
 endef
 
 define Build/Compile
-       ( \
-               cd $(PKG_BUILD_DIR); \
-               $(GO_PKG_VARS) \
-               GITCOMMIT=$(PKG_GIT_SHORT_COMMIT) \
-               VERSION=$(PKG_VERSION) \
-               ./scripts/build/binary; \
-       )
+       cd $(PKG_BUILD_DIR); \
+       $(GO_PKG_VARS) \
+       GITCOMMIT=$(PKG_GIT_SHORT_COMMIT) \
+       VERSION=$(PKG_VERSION) \
+       TARGET=$(PKG_BUILD_DIR)/build \
+       ./scripts/build/binary
 endef
 
 define Package/docker/install