From e7e261cad79388b39b64fbc3309fd5923e099f92 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 13 Feb 2025 19:14:14 +1000 Subject: [PATCH 1/5] dockerd: Improved error msg for rev ver dep check Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 8ad6e2f9e36018..0068fa11d71d93 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dockerd PKG_VERSION:=27.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -71,7 +71,7 @@ define EnsureVendoredVersion DEP_VER=$$$$( grep --only-matching --perl-regexp '(?<=PKG_VERSION:=)(.*)' "$(1)" ); \ VEN_VER=$$$$( grep --only-matching --perl-regexp '(?<=_VERSION:=v)(.*)(?=})' "$(PKG_BUILD_DIR)/hack/dockerfile/install/$(2)" ); \ if [ "$$$${VEN_VER}" != "$$$${DEP_VER}" ]; then \ - echo "ERROR: Expected 'PKG_VERSION:=$$$${VEN_VER}' in '$(1)', found 'PKG_VERSION:=$$$${DEP_VER}'"; \ + echo "ERROR: $(PKG_NAME) Expected 'PKG_VERSION:=$$$${VEN_VER}' in '$(1)', found 'PKG_VERSION:=$$$${DEP_VER}'"; \ exit 1; \ fi \ ) From 98da2818ebc2a4af846ffbd059ba88cd21d8f5ab Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 13 Feb 2025 19:17:07 +1000 Subject: [PATCH 2/5] docker: Added reverse dependency version check Signed-off-by: Gerard Ryan --- utils/docker/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker/Makefile b/utils/docker/Makefile index fca979b4cfaaba..a73817c69523c7 100644 --- a/utils/docker/Makefile +++ b/utils/docker/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker PKG_VERSION:=27.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -15,7 +15,7 @@ PKG_GIT_SHORT_COMMIT:=ce12230 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan -PKG_BUILD_DEPENDS:=golang/host +PKG_BUILD_DEPENDS:=golang/host dockerd PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 From 2aabc522f6e4d8450a0c8c7ea50891e08a662608 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 13 Feb 2025 19:18:30 +1000 Subject: [PATCH 3/5] tini: Added reverse dependency version check Signed-off-by: Gerard Ryan --- utils/tini/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/tini/Makefile b/utils/tini/Makefile index e6e5aeb552e161..8b1aa97be3e360 100644 --- a/utils/tini/Makefile +++ b/utils/tini/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tini PKG_VERSION:=0.19.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/krallin/tini/tar.gz/v${PKG_VERSION}? @@ -14,6 +14,7 @@ PKG_MAINTAINER:=Gerard Ryan PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:tini_project:tini +PKG_BUILD_DEPENDS:=dockerd include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk From a3b5c6e46981c9ad75e933ae8fe3000343882614 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 13 Feb 2025 19:18:53 +1000 Subject: [PATCH 4/5] runc: Added reverse dependency version check Signed-off-by: Gerard Ryan --- utils/runc/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 13dd5bec0560ae..c2cadf854a54a9 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc PKG_VERSION:=1.1.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:linuxfoundation:runc @@ -13,7 +13,7 @@ PKG_HASH:=563cf57c38d2e7149234dbe6f63ca0751eb55ef8f586ed12a543dedc1aceba68 PKG_MAINTAINER:=Gerard Ryan -PKG_BUILD_DEPENDS:=golang/host +PKG_BUILD_DEPENDS:=golang/host dockerd PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_BUILD_FLAGS:=no-mips16 From 5aec3fc8202265303f25891025e6151c626ea81c Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Thu, 13 Feb 2025 19:19:17 +1000 Subject: [PATCH 5/5] containerd: Added reverse dependency version check Signed-off-by: Gerard Ryan --- utils/containerd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index 4e3dd6af546e49..4f9c21bf014c9b 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd PKG_VERSION:=1.7.22 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:linuxfoundation:containerd @@ -13,7 +13,7 @@ PKG_HASH:=8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 PKG_MAINTAINER:=Gerard Ryan -PKG_BUILD_DEPENDS:=golang/host +PKG_BUILD_DEPENDS:=golang/host dockerd PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_BUILD_FLAGS:=no-mips16