From fa5e049513bb856ce9fd5facae4aa5e37a4c04ad Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Mon, 27 Jul 2020 09:39:54 +0000 Subject: [PATCH] containerd: Removed DevInstall target and Refactor Signed-off-by: Gerard Ryan --- utils/containerd/Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index 9afce5420..d9b5c38f9 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd PKG_VERSION:=1.2.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -51,7 +51,6 @@ GO_PKG_INSTALL_ALL:=1 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) MAKE_VARS += $(GO_PKG_VARS) MAKE_FLAGS += \ - DESTDIR="$(PKG_INSTALL_DIR)" \ VERSION=$(PKG_VERSION) \ REVISION=$(PKG_SOURCE_VERSION) @@ -61,16 +60,8 @@ else MAKE_FLAGS += BUILDTAGS='' endif -define Build/Compile - $(call Build/Compile/Default) -endef - -# Avoid installing binaries -define Build/InstallDev - $(call Build/Compile/Default,clean) - rm -f $(STAMP_BUILT) - $(call GoPackage/Build/InstallDev,$(1)) -endef +# Reset golang-package.mk overrides so we can use the Makefile +Build/Compile=$(call Build/Compile/Default) define Package/containerd/install $(INSTALL_DIR) $(1)/usr/bin/