build podman the same way

deploy/iso/minikube-iso/arch/aarch64/package/Config.in

@@ -5,5 +5,4 @@ menu "System tools aarch64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/podman-aarch64/Config.in"
 endmenu

deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/Config.in

@@ -1,12 +0,0 @@
-config BR2_PACKAGE_PODMAN_AARCH64
-	bool "podman"
-	default y
-	depends on BR2_aarch64
-	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_RUNC_MASTER
-	select BR2_PACKAGE_CRUN
-	select BR2_PACKAGE_CONMON
-	select BR2_PACKAGE_LIBSECCOMP
-	select BR2_PACKAGE_LIBGPGME

deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk

@@ -1,71 +0,0 @@
-PODMAN_AARCH64_VERSION = v3.4.2
-PODMAN_AARCH64_COMMIT = 2ad1fd3555de12de34e20898cc2ef901f08fe5ed
-PODMAN_AARCH64_SITE = https://github.com/containers/podman/archive
-PODMAN_AARCH64_SOURCE = $(PODMAN_AARCH64_VERSION).tar.gz
-PODMAN_AARCH64_LICENSE = Apache-2.0
-PODMAN_AARCH64_LICENSE_FILES = LICENSE
-
-PODMAN_AARCH64_DEPENDENCIES = host-go
-ifeq ($(BR2_INIT_SYSTEMD),y)
-# need libsystemd for journal
-PODMAN_AARCH64_DEPENDENCIES += systemd
-endif
-
-PODMAN_AARCH64_GOPATH = $(@D)/_output
-PODMAN_AARCH64_BIN_ENV = \
-	$(GO_TARGET_ENV) \
-	CGO_ENABLED=1 \
-	GOPATH="$(PODMAN_AARCH64_GOPATH)" \
-	PATH=$(PODMAN_AARCH64_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=arm64
-
-
-define PODMAN_AARCH64_USERS
-	- -1 podman -1 - - - - -
-endef
-
-define PODMAN_AARCH64_MOD_VENDOR_MAKEFILE
-	# "build flag -mod=vendor only valid when using modules"
-	sed -e 's|-mod=vendor ||' -i $(@D)/Makefile
-endef
-
-PODMAN_AARCH64_POST_EXTRACT_HOOKS += PODMAN_AARCH64_MOD_VENDOR_MAKEFILE
-
-define PODMAN_AARCH64_CONFIGURE_CMDS
-	mkdir -p $(PODMAN_AARCH64_GOPATH) && mv $(@D)/vendor $(PODMAN_AARCH64_GOPATH)/src
-
-	mkdir -p $(PODMAN_AARCH64_GOPATH)/src/github.com/containers
-	ln -sf $(@D) $(PODMAN_AARCH64_GOPATH)/src/github.com/containers/podman
-
-	ln -sf $(@D) $(PODMAN_AARCH64_GOPATH)/src/github.com/containers/podman/v2
-endef
-
-define PODMAN_AARCH64_BUILD_CMDS
-	mkdir -p $(@D)/bin
-	$(PODMAN_AARCH64_BIN_ENV) CIRRUS_TAG=$(PODMAN_AARCH64_VERSION) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(PODMAN_AARCH64_COMMIT) PREFIX=/usr podman
-endef
-
-define PODMAN_AARCH64_INSTALL_TARGET_CMDS
-	$(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman
-	$(INSTALL) -d -m 755 $(TARGET_DIR)/etc/cni/net.d/
-	$(INSTALL) -m 644 $(@D)/cni/87-podman-bridge.conflist $(TARGET_DIR)/etc/cni/net.d/87-podman-bridge.conflist
-endef
-
-define PODMAN_AARCH64_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 644 \
-			$(@D)/contrib/systemd/system/podman.service \
-			$(TARGET_DIR)/usr/lib/systemd/system/podman.service
-	$(INSTALL) -D -m 644 \
-			$(@D)/contrib/systemd/system/podman.socket \
-			$(TARGET_DIR)/usr/lib/systemd/system/podman.socket
-
-	# Allow running podman-remote as a user in the group "podman"
-	$(INSTALL) -D -m 644 \
-			$(PODMAN_AARCH64_PKGDIR)/override.conf \
-			$(TARGET_DIR)/usr/lib/systemd/system/podman.socket.d/override.conf
-	$(INSTALL) -D -m 644 \
-			$(PODMAN_AARCH64_PKGDIR)/podman.conf \
-			$(TARGET_DIR)/usr/lib/tmpfiles.d/podman.conf
-endef
-
-$(eval $(generic-package))

deploy/iso/minikube-iso/arch/x86_64/package/Config.in

@@ -5,7 +5,6 @@ menu "System tools x86_64"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
-    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-guest/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in"
 endmenu

deploy/iso/minikube-iso/arch/x86_64/package/podman/override.conf

@@ -1,4 +0,0 @@
-[Socket]
-SocketMode=0660
-SocketUser=root
-SocketGroup=podman

deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.conf

@@ -1 +0,0 @@
-d /run/podman 0770 root podman

deploy/iso/minikube-iso/arch/x86_64/package/podman/podman.hash

@@ -1,6 +0,0 @@
-sha256 a16846fe076aaf2c9ea2e854c3baba9fb838d916be7fb4b5be332e6c92d907d4 v1.9.3.tar.gz
-sha256 5ebaa6e0dbd7fd1863f70d2bc71dc8a94e195c3339c17e3cac4560c9ec5747f8 v2.1.1.tar.gz
-sha256 ec5473e51fa28f29af323473fc484f742dc7df23d06d8ba9f217f13382893a71 v2.2.0.tar.gz
-sha256 3212bad60d945c1169b27da03959f36d92d1d8964645c701a5a82a89118e96d1 v2.2.1.tar.gz
-sha256 5a0d42e03d15e32c5c54a147da5ef1b8928ec00982ac9e3f1edc82c5e614b6d2 v3.1.2.tar.gz
-sha256 b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31 v3.4.2.tar.gz

deploy/iso/minikube-iso/package/Config.in

@@ -8,4 +8,5 @@ menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/gluster/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/falco-module/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/scheduled-stop/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
 endmenu

deploy/iso/minikube-iso/package/cni/cni.mk

@@ -20,7 +20,6 @@ CNI_MAKE_ENV = \
 	GOPATH="$(CNI_GOPATH)" \
 	GOBIN="$(CNI_GOPATH)/bin" \
 	PATH=$(CNI_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=amd64
 
 CNI_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"'
 

deploy/iso/minikube-iso/package/cri-dockerd/cri-dockerd.mk

@@ -21,7 +21,6 @@ CRI_DOCKERD_ENV = \
 	GOPATH="$(CRI_DOCKERD_GOPATH)" \
 	GOBIN="$(CRI_DOCKERD_GOPATH)/bin" \
 	PATH=$(CRI_DOCKERD_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=amd64
 
 CRI_DOCKERD_COMPILE_SRC = $(CRI_DOCKERD_GOPATH)/src/github.com/Mirantis/cri-dockerd
 CRI_DOCKERD_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_REV)'"