Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12967 from G-M0N3Y-2503/docker-deps-devinstall-remove

Browse source 
runc/containerd/libnetwork: Refactored Makefiles
This commit is contained in:
Rosen Penev 2020-08-18 14:12:48 -07:00 committed by GitHub
commit c8fc7c3d76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
utils/containerd/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=containerd PKG_NAME:=containerd
PKG_VERSION:=1.2.13 PKG_VERSION:=1.2.13
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE 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_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
MAKE_VARS += $(GO_PKG_VARS) MAKE_VARS += $(GO_PKG_VARS)
MAKE_FLAGS += \ MAKE_FLAGS += \
DESTDIR="$(PKG_INSTALL_DIR)" \
VERSION=$(PKG_VERSION) \ VERSION=$(PKG_VERSION) \
REVISION=$(PKG_SOURCE_VERSION) REVISION=$(PKG_SOURCE_VERSION)
@ -61,16 +60,8 @@ else
MAKE_FLAGS += BUILDTAGS='' MAKE_FLAGS += BUILDTAGS=''
endif endif
define Build/Compile # Reset golang-package.mk overrides so we can use the Makefile
$(call Build/Compile/Default) 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
define Package/containerd/install define Package/containerd/install
$(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/bin/

12
utils/libnetwork/Makefile
View file

@ -1,15 +1,10 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libnetwork PKG_NAME:=libnetwork
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE 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_PROTO:=git
PKG_SOURCE_URL:=https://$(GO_PKG) PKG_SOURCE_URL:=https://$(GO_PKG)
PKG_SOURCE_VERSION:=026aabaa659832804b01754aaadd2c0f420c68b6 PKG_SOURCE_VERSION:=026aabaa659832804b01754aaadd2c0f420c68b6
@ -21,6 +16,11 @@ PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1 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 $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk include ../../lang/golang/golang-package.mk

18
utils/runc/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=runc PKG_NAME:=runc
PKG_VERSION:=1.0.0-rc10 PKG_VERSION:=1.0.0-rc10
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -15,6 +15,7 @@ PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
GO_PKG:=github.com/opencontainers/runc GO_PKG:=github.com/opencontainers/runc
@ -50,8 +51,7 @@ endef
GO_PKG_INSTALL_ALL:=1 GO_PKG_INSTALL_ALL:=1
MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG)
MAKE_VARS += $(GO_PKG_VARS) MAKE_VARS += $(GO_PKG_VARS)
MAKE_FLAGS += \ MAKE_FLAGS += COMMIT=$(PKG_SOURCE_VERSION)
COMMIT=$(PKG_SOURCE_VERSION)
ifeq ($(ARCH),mips) ifeq ($(ARCH),mips)
MAKE_FLAGS += EXTRA_FLAGS='-buildmode=default' MAKE_FLAGS += EXTRA_FLAGS='-buildmode=default'
@ -63,16 +63,8 @@ else
MAKE_FLAGS += BUILDTAGS='' MAKE_FLAGS += BUILDTAGS=''
endif endif
define Build/Compile # Reset golang-package.mk overrides so we can use the Makefile
$(call Build/Compile/Default) 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
define Package/runc/install define Package/runc/install
$(INSTALL_DIR) $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/sbin/