|
|
@ -1,15 +1,17 @@ |
|
|
|
include $(TOPDIR)/rules.mk |
|
|
|
|
|
|
|
PKG_NAME:=dockerd |
|
|
|
PKG_VERSION:=20.10.2 |
|
|
|
PKG_RELEASE:=5 |
|
|
|
PKG_VERSION:=20.10.3 |
|
|
|
PKG_RELEASE:=1 |
|
|
|
PKG_LICENSE:=Apache-2.0 |
|
|
|
PKG_LICENSE_FILES:=LICENSE |
|
|
|
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz |
|
|
|
PKG_SOURCE_URL:=https://codeload.github.com/moby/moby/tar.gz/v$(PKG_VERSION)? |
|
|
|
PKG_HASH:=dc4818f0cba2ded2f6f7420a1fda027ddbf6c6c9fe319f84d1311bfe610447ca |
|
|
|
PKG_SOURCE_VERSION:=8891c58 # SHA1 used within the docker executables |
|
|
|
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:=62bb03f197b8a064da568e62639f6834f91c8cfc9273126a978847becc214c31 |
|
|
|
PKG_GIT_SHORT_COMMIT:=46229ca # SHA1 used within the docker executables |
|
|
|
|
|
|
|
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> |
|
|
|
|
|
|
@ -56,8 +58,8 @@ define EnsureVendoredVersion |
|
|
|
( \
|
|
|
|
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)" ); \
|
|
|
|
if [ $$$$VEN_VER != $$$$DEP_VER ]; then \
|
|
|
|
echo "ERROR: Expected 'PKG_SOURCE_VERSION:=$$$$VEN_VER' in '$(1)', found 'PKG_SOURCE_VERSION:=$$$$DEP_VER'"; \
|
|
|
|
if [ "$$$${VEN_VER}" != "$$$${DEP_VER}" ]; then \
|
|
|
|
echo "ERROR: Expected 'PKG_SOURCE_VERSION:=$$$${VEN_VER}' in '$(1)', found 'PKG_SOURCE_VERSION:=$$$${DEP_VER}'"; \
|
|
|
|
exit 1; \
|
|
|
|
fi \
|
|
|
|
) |
|
|
@ -75,9 +77,18 @@ define Build/Prepare |
|
|
|
# Verify CLI is the same version |
|
|
|
( \
|
|
|
|
CLI_MAKEFILE="../docker/Makefile"; \
|
|
|
|
CLI_VERSION=$$$$( grep --only-matching --perl-regexp '(?<=PKG_VERSION:=)(.*)' "$$$$CLI_MAKEFILE" ); \
|
|
|
|
if [ $$$$CLI_VERSION != $(PKG_VERSION) ]; then \
|
|
|
|
echo "ERROR: Expected 'PKG_VERSION:=$(PKG_VERSION)' in '$$$$CLI_MAKEFILE', found 'PKG_VERSION:=$$$$CLI_VERSION'"; \
|
|
|
|
CLI_VERSION=$$$$( grep --only-matching --perl-regexp '(?<=PKG_VERSION:=)(.*)' "$$$${CLI_MAKEFILE}" ); \
|
|
|
|
if [ "$$$${CLI_VERSION}" != "$(PKG_VERSION)" ]; then \
|
|
|
|
echo "ERROR: Expected 'PKG_VERSION:=$(PKG_VERSION)' in '$$$${CLI_MAKEFILE}', found 'PKG_VERSION:=$$$${CLI_VERSION}'"; \
|
|
|
|
exit 1; \
|
|
|
|
fi \
|
|
|
|
) |
|
|
|
|
|
|
|
# Verify PKG_GIT_SHORT_COMMIT |
|
|
|
( \
|
|
|
|
EXPECTED_PKG_GIT_SHORT_COMMIT=$$$$( $(CURDIR)/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 \
|
|
|
|
) |
|
|
@ -95,7 +106,7 @@ define Build/Compile |
|
|
|
( \
|
|
|
|
cd $(PKG_BUILD_DIR); \
|
|
|
|
$(GO_PKG_VARS) \
|
|
|
|
DOCKER_GITCOMMIT=$(PKG_SOURCE_VERSION) \
|
|
|
|
DOCKER_GITCOMMIT=$(PKG_GIT_SHORT_COMMIT) \
|
|
|
|
DOCKER_BUILDTAGS='$(BUILDTAGS)' \
|
|
|
|
VERSION=$(PKG_VERSION) \
|
|
|
|
./hack/make.sh binary; \
|
|
|
|