From fa5e049513bb856ce9fd5facae4aa5e37a4c04ad Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Mon, 27 Jul 2020 09:39:54 +0000 Subject: [PATCH 1/3] 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 9afce54200..d9b5c38f95 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/ From d13f7612939e01acebbf633a9bfefbb109a4deba Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Mon, 27 Jul 2020 09:40:18 +0000 Subject: [PATCH 2/3] libnetwork: Changed Makefile layout to match runc Signed-off-by: Gerard Ryan --- utils/libnetwork/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/libnetwork/Makefile b/utils/libnetwork/Makefile index 92d7c3ecb1..484340178e 100644 --- a/utils/libnetwork/Makefile +++ b/utils/libnetwork/Makefile @@ -1,15 +1,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetwork -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -GO_PKG:=github.com/docker/libnetwork -GO_PKG_BUILD_PKG:= \ - $(GO_PKG)/cmd/proxy \ - $(GO_PKG)/cmd/dnet - PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://$(GO_PKG) PKG_SOURCE_VERSION:=026aabaa659832804b01754aaadd2c0f420c68b6 @@ -21,6 +16,11 @@ PKG_MAINTAINER:=Gerard Ryan PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 +GO_PKG:=github.com/docker/libnetwork +GO_PKG_BUILD_PKG:= \ + $(GO_PKG)/cmd/proxy \ + $(GO_PKG)/cmd/dnet + include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk From f13797524ad995547d7ca2cba7e7a3c9a9eaee20 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Mon, 27 Jul 2020 09:40:37 +0000 Subject: [PATCH 3/3] runc: Removed DevInstall target and Refactor Signed-off-by: Gerard Ryan --- utils/runc/Makefile | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 605b852b7d..8bece6b0a6 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc PKG_VERSION:=1.0.0-rc10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -15,6 +15,7 @@ PKG_MAINTAINER:=Gerard Ryan PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 PKG_USE_MIPS16:=0 GO_PKG:=github.com/opencontainers/runc @@ -50,8 +51,7 @@ endef GO_PKG_INSTALL_ALL:=1 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) MAKE_VARS += $(GO_PKG_VARS) -MAKE_FLAGS += \ - COMMIT=$(PKG_SOURCE_VERSION) +MAKE_FLAGS += COMMIT=$(PKG_SOURCE_VERSION) ifeq ($(ARCH),mips) MAKE_FLAGS += EXTRA_FLAGS='-buildmode=default' @@ -63,16 +63,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/runc/install $(INSTALL_DIR) $(1)/usr/sbin/