From c8c720d6c4b84f4812e5c0560c17696627faede1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 16 Apr 2018 20:27:26 +0200 Subject: [PATCH] Upgrade from kpod 0.1 to (new name) podman 0.4.1 Simple management tool for containers and images "podman shares state with crio and so has the capability to debug pods/images created by crio" https://github.com/projectatomic/libpod/pull/145 --- deploy/iso/minikube-iso/package/Config.in | 2 +- .../iso/minikube-iso/package/kpod/kpod.hash | 2 -- deploy/iso/minikube-iso/package/kpod/kpod.mk | 32 ------------------- .../package/{kpod => podman}/Config.in | 4 +-- .../minikube-iso/package/podman/podman.hash | 1 + .../iso/minikube-iso/package/podman/podman.mk | 32 +++++++++++++++++++ 6 files changed, 36 insertions(+), 37 deletions(-) delete mode 100644 deploy/iso/minikube-iso/package/kpod/kpod.hash delete mode 100644 deploy/iso/minikube-iso/package/kpod/kpod.mk rename deploy/iso/minikube-iso/package/{kpod => podman}/Config.in (84%) create mode 100644 deploy/iso/minikube-iso/package/podman/podman.hash create mode 100644 deploy/iso/minikube-iso/package/podman/podman.mk diff --git a/deploy/iso/minikube-iso/package/Config.in b/deploy/iso/minikube-iso/package/Config.in index 3dc44974d50e..140fa4cb29bf 100644 --- a/deploy/iso/minikube-iso/package/Config.in +++ b/deploy/iso/minikube-iso/package/Config.in @@ -1,7 +1,7 @@ menu "System tools" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/rkt-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in" - source "$BR2_EXTERNAL_MINIKUBE_PATH/package/kpod/Config.in" + source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-tools/Config.in" source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in" diff --git a/deploy/iso/minikube-iso/package/kpod/kpod.hash b/deploy/iso/minikube-iso/package/kpod/kpod.hash deleted file mode 100644 index d520927fce74..000000000000 --- a/deploy/iso/minikube-iso/package/kpod/kpod.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 b8607ac0fc4cea5f66cdf6d628bf74550d4bfb62ed279c965499691a87a1bcc6 b85d0fa4ea5b6515088a3475a56a44c0cee5bfc5.tar.gz diff --git a/deploy/iso/minikube-iso/package/kpod/kpod.mk b/deploy/iso/minikube-iso/package/kpod/kpod.mk deleted file mode 100644 index 54f19aa9ea05..000000000000 --- a/deploy/iso/minikube-iso/package/kpod/kpod.mk +++ /dev/null @@ -1,32 +0,0 @@ -KPOD_VERSION = b85d0fa4ea5b6515088a3475a56a44c0cee5bfc5 -KPOD_SITE = https://github.com/projectatomic/libpod/archive -KPOD_SOURCE = $(KPOD_VERSION).tar.gz -KPOD_LICENSE = Apache-2.0 -KPOD_LICENSE_FILES = LICENSE - -KPOD_DEPENDENCIES = host-go - -KPOD_GOPATH = $(@D)/_output -KPOD_BIN_ENV = \ - CGO_ENABLED=1 \ - GOPATH="$(KPOD_GOPATH)" \ - GOBIN="$(KPOD_GOPATH)/bin" \ - PATH=$(KPOD_GOPATH)/bin:$(BR_PATH) - - -define KPOD_CONFIGURE_CMDS - mkdir -p $(KPOD_GOPATH)/src/github.com/projectatomic - ln -sf $(@D) $(KPOD_GOPATH)/src/github.com/projectatomic/libpod - $(KPOD_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.tools DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr -endef - -define KPOD_BUILD_CMDS - mkdir -p $(@D)/bin - $(KPOD_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr kpod -endef - -define KPOD_INSTALL_TARGET_CMDS - $(INSTALL) -Dm755 $(@D)/bin/kpod $(TARGET_DIR)/usr/bin/kpod -endef - -$(eval $(generic-package)) diff --git a/deploy/iso/minikube-iso/package/kpod/Config.in b/deploy/iso/minikube-iso/package/podman/Config.in similarity index 84% rename from deploy/iso/minikube-iso/package/kpod/Config.in rename to deploy/iso/minikube-iso/package/podman/Config.in index 290ce76afbc7..f9451eface92 100644 --- a/deploy/iso/minikube-iso/package/kpod/Config.in +++ b/deploy/iso/minikube-iso/package/podman/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_KPOD - bool "kpod" +config BR2_PACKAGE_PODMAN + bool "podman" default y depends on BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash new file mode 100644 index 000000000000..e83aaade90fb --- /dev/null +++ b/deploy/iso/minikube-iso/package/podman/podman.hash @@ -0,0 +1 @@ +sha256 8f71046aa2ad9e380d1f50a800a8e5cc9801bf645a2831712378742282a0a36a v0.4.1.tar.gz diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk new file mode 100644 index 000000000000..555292bd89e8 --- /dev/null +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -0,0 +1,32 @@ +PODMAN_VERSION = v0.4.1 +PODMAN_SITE = https://github.com/projectatomic/libpod/archive +PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz +PODMAN_LICENSE = Apache-2.0 +PODMAN_LICENSE_FILES = LICENSE + +PODMAN_DEPENDENCIES = host-go + +PODMAN_GOPATH = $(@D)/_output +PODMAN_BIN_ENV = \ + CGO_ENABLED=1 \ + GOPATH="$(PODMAN_GOPATH)" \ + GOBIN="$(PODMAN_GOPATH)/bin" \ + PATH=$(PODMAN_GOPATH)/bin:$(BR_PATH) + + +define PODMAN_CONFIGURE_CMDS + mkdir -p $(PODMAN_GOPATH)/src/github.com/projectatomic + ln -sf $(@D) $(PODMAN_GOPATH)/src/github.com/projectatomic/libpod + $(PODMAN_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.tools DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr +endef + +define PODMAN_BUILD_CMDS + mkdir -p $(@D)/bin + $(PODMAN_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr podman +endef + +define PODMAN_INSTALL_TARGET_CMDS + $(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman +endef + +$(eval $(generic-package))