kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6665 from afbjorklund/conmon-release 

Rename conmon package to reflect release version
pull/6754/head
Medya Ghazizadeh 2020-02-22 08:17:04 -08:00 committed by GitHub
parent b49d446426 5ec9ea18ba
commit 4ca33ff6a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/iso/minikube-iso/package/Config.in
View File

@ -2,7 +2,7 @@ menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/varlink/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crictl-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"

25
deploy/iso/minikube-iso/package/conmon-master/conmon-master.mk
View File

@ -1,25 +0,0 @@
################################################################################
#
# conmon
#
################################################################################
# HEAD as of 2019-12-11, v2.0.6
CONMON_MASTER_VERSION = 29c336700f2999acf9db07662b4a61355076e64a
CONMON_MASTER_SITE = https://github.com/containers/conmon/archive
CONMON_MASTER_SOURCE = $(CONMON_MASTER_VERSION).tar.gz
CONMON_MASTER_LICENSE = Apache-2.0
CONMON_MASTER_LICENSE_FILES = LICENSE
CONMON_MASTER_DEPENDENCIES = host-pkgconf
define CONMON_MASTER_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(CONMON_MASTER_VERSION) PREFIX=/usr
endef
define CONMON_MASTER_INSTALL_TARGET_CMDS
$(INSTALL) -Dm755 $(@D)/bin/conmon $(TARGET_DIR)/usr/libexec/crio/conmon
$(INSTALL) -Dm755 $(@D)/bin/conmon $(TARGET_DIR)/usr/libexec/podman/conmon
endef
$(eval $(generic-package))

4
deploy/iso/minikube-iso/package/conmon-master/Config.in → deploy/iso/minikube-iso/package/conmon/Config.in
View File

@ -1,5 +1,5 @@
config BR2_PACKAGE_CONMON_MASTER
bool "conmon-master"
config BR2_PACKAGE_CONMON
bool "conmon"
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS

3
deploy/iso/minikube-iso/package/conmon-master/conmon-master.hash → deploy/iso/minikube-iso/package/conmon/conmon.hash
View File

@ -1,5 +1,8 @@
# Locally computed
sha256 4f978a59c6ee516f7e3febfb3b0360a17d1be2c283313e1aeb27adcb8c8f9166 dde3ccf93f01ce5a3e0f7a2c97053697cc3ed152.tar.gz
sha256 75fad6e66b43c5039719edbd82ba072723aea6a9d4d8be4e7ac1c245a291ab1b 8455ce1ef385120deb827d0f0588c04357bad4c4.tar.gz
sha256 32db4ea508a9ff0266b8695ae32604869994371a5a09436438c366a09ddcc1df v0.3.0.tar.gz
sha256 6c9bf278ae6e125a39f1ae419e5bd314162a743f6587d70b1b6be095ac32b9af eb5fa88c26fde5ce1e3f8a1d2a8a9498b2d7dbe6.tar.gz
sha256 50cc36636c32a343f4c9f5ab6b9f7f5edd5d6ef7c9c403793f799f6605597718 v2.0.3.tar.gz
sha256 93f7c127cb536fc60f4c08291fd34e99e492fdc6a36e6b0ddad97d868ecf10f7 29c336700f2999acf9db07662b4a61355076e64a.tar.gz
sha256 d82ad6c1e315f8310ed75fe6905f81dce61b61d55a156e9e04c9855e78e1e165 v2.0.6.tar.gz

25
deploy/iso/minikube-iso/package/conmon/conmon.mk Normal file
View File

@ -0,0 +1,25 @@
################################################################################
#
# conmon
#
################################################################################
CONMON_VERSION = v2.0.6
CONMON_COMMIT = 29c336700f2999acf9db07662b4a61355076e64a
CONMON_SITE = https://github.com/containers/conmon/archive
CONMON_SOURCE = $(CONMON_VERSION).tar.gz
CONMON_LICENSE = Apache-2.0
CONMON_LICENSE_FILES = LICENSE
CONMON_DEPENDENCIES = host-pkgconf
define CONMON_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(CONMON_COMMIT) PREFIX=/usr
endef
define CONMON_INSTALL_TARGET_CMDS
$(INSTALL) -Dm755 $(@D)/bin/conmon $(TARGET_DIR)/usr/libexec/crio/conmon
$(INSTALL) -Dm755 $(@D)/bin/conmon $(TARGET_DIR)/usr/libexec/podman/conmon
endef
$(eval $(generic-package))

1
deploy/iso/minikube-iso/package/crio-bin/Config.in
View File

@ -9,6 +9,7 @@ config BR2_PACKAGE_CRIO_BIN
depends on !BR2_STATIC_LIBS # lvm2
depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
select BR2_PACKAGE_RUNC_MASTER
select BR2_PACKAGE_CONMON
select BR2_PACKAGE_BTRFS_PROGS
select BR2_PACKAGE_LIBSECCOMP
select BR2_PACKAGE_LIBGPGME

3
deploy/iso/minikube-iso/package/podman/Config.in
View File

@ -5,6 +5,7 @@ config BR2_PACKAGE_PODMAN
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_CONMON_MASTER
select BR2_PACKAGE_RUNC_MASTER
select BR2_PACKAGE_CONMON
select BR2_PACKAGE_LIBSECCOMP
select BR2_PACKAGE_LIBGPGME