Skip to content

Commit

Permalink
Upgrade from kpod 0.1 to (new name) podman 0.4.1
Browse files Browse the repository at this point in the history
Simple management tool for containers and images

"podman shares state with crio and so has the
capability to debug pods/images created by crio"

containers/podman#145
  • Loading branch information
afbjorklund committed Jul 30, 2018
1 parent 4c89d41 commit c8c720d
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion deploy/iso/minikube-iso/package/Config.in
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 0 additions & 2 deletions deploy/iso/minikube-iso/package/kpod/kpod.hash

This file was deleted.

32 changes: 0 additions & 32 deletions deploy/iso/minikube-iso/package/kpod/kpod.mk

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/podman/podman.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sha256 8f71046aa2ad9e380d1f50a800a8e5cc9801bf645a2831712378742282a0a36a v0.4.1.tar.gz
32 changes: 32 additions & 0 deletions deploy/iso/minikube-iso/package/podman/podman.mk
Original file line number Diff line number Diff line change
@@ -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))

0 comments on commit c8c720d

Please sign in to comment.