@ -1,7 +1,7 @@
i n c l u d e $( TOPDIR ) / r u l e s . m k
i n c l u d e $( TOPDIR ) / r u l e s . m k
PKG_NAME := dockerd
PKG_NAME := dockerd
PKG_VERSION := 20.10.12
PKG_VERSION := 20.10.14
PKG_RELEASE := $( AUTORELEASE)
PKG_RELEASE := $( AUTORELEASE)
PKG_LICENSE := Apache-2.0
PKG_LICENSE := Apache-2.0
PKG_LICENSE_FILES := LICENSE
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_URL := github.com/moby/moby
PKG_GIT_REF := v$( PKG_VERSION)
PKG_GIT_REF := v$( PKG_VERSION)
PKG_SOURCE_URL := https://codeload.$( PKG_GIT_URL) /tar.gz/$( PKG_GIT_REF) ?
PKG_SOURCE_URL := https://codeload.$( PKG_GIT_URL) /tar.gz/$( PKG_GIT_REF) ?
PKG_HASH := a8ee80d31c7b74f687a837cd2a8570578f118179fba0844c5ee88f90fe180155
PKG_GIT_SHORT_COMMIT := 459d0df # SHA1 used within the docker executables
PKG_HASH := dbe1ae342351108b7b30232c4bce0559c81ad9fb6c978d7c8425d6aa53e476c1
PKG_GIT_SHORT_COMMIT := 87a90dc # SHA1 used within the docker executables
PKG_MAINTAINER := Gerard Ryan <G.M0N3Y.2503@gmail.com>
PKG_MAINTAINER := Gerard Ryan <G.M0N3Y.2503@gmail.com>
@ -55,6 +55,19 @@ TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
# $(1) = path to dependent package 'Makefile'
# $(1) = path to dependent package 'Makefile'
# $(2) = relevant dependency '.installer' file
# $(2) = relevant dependency '.installer' file
d e f i n e E n s u r e V e n d o r e d V e r s i o n
d e f i n e E n s u r e V e n d o r e d V e r s i o n
( \
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}' " ; \
exit 1; \
fi \
)
e n d e f
# $(1) = path to dependent package 'Makefile'
# $(2) = relevant dependency '.installer' file
d e f i n e E n s u r e V e n d o r e d C o m m i t
( \
( \
DEP_VER = $$ $$ ( grep --only-matching --perl-regexp '(?<=PKG_SOURCE_VERSION:=)(.*)' " $( 1) " ) ; \
DEP_VER = $$ $$ ( grep --only-matching --perl-regexp '(?<=PKG_SOURCE_VERSION:=)(.*)' " $( 1) " ) ; \
VEN_VER = $$ $$ ( grep --only-matching --perl-regexp '(?<=_COMMIT:=)(.*)(?=})' " $( PKG_BUILD_DIR) /hack/dockerfile/install/ $( 2) " ) ; \
VEN_VER = $$ $$ ( grep --only-matching --perl-regexp '(?<=_COMMIT:=)(.*)(?=})' " $( PKG_BUILD_DIR) /hack/dockerfile/install/ $( 2) " ) ; \
@ -70,7 +83,7 @@ define Build/Prepare
# Verify dependencies are the vendored version
# Verify dependencies are the vendored version
$( call EnsureVendoredVersion,../containerd/Makefile,containerd.installer)
$( call EnsureVendoredVersion,../containerd/Makefile,containerd.installer)
$( call EnsureVendoredVersion ,../libnetwork/Makefile,proxy.installer)
$( call EnsureVendoredCommit ,../libnetwork/Makefile,proxy.installer)
$( call EnsureVendoredVersion,../runc/Makefile,runc.installer)
$( call EnsureVendoredVersion,../runc/Makefile,runc.installer)
$( call EnsureVendoredVersion,../tini/Makefile,tini.installer)
$( call EnsureVendoredVersion,../tini/Makefile,tini.installer)