diff --git a/package/Config.in b/package/Config.in index 3898d774..75584886 100644 --- a/package/Config.in +++ b/package/Config.in @@ -31,7 +31,6 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/mcd/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/mdns-alias/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/netbrowse/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/onieprom/Config.in" -source "$BR2_EXTERNAL_INFIX_PATH/package/podman/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/python-spy/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/python-libyang/Config.in" source "$BR2_EXTERNAL_INFIX_PATH/package/python-yangdoc/Config.in" diff --git a/package/podman/Config.in b/package/podman/Config.in deleted file mode 100644 index 5f291d96..00000000 --- a/package/podman/Config.in +++ /dev/null @@ -1,56 +0,0 @@ -config BR2_PACKAGE_PODMAN - bool "podman" - 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 - depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve - depends on BR2_USE_MMU # libgpgme - select BR2_PACKAGE_CRUN # runtime dependency - select BR2_PACKAGE_CONMON # runtime dependency - select BR2_PACKAGE_CNI_PLUGINS # runtime dependency - select BR2_PACKAGE_BRIDGE_UTILS # Required for container networking - select BR2_PACKAGE_IPTABLES # Required for container network - select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency - select BR2_PACKAGE_CA_CERTIFICATES # Required for the podman pull command via https - select BR2_PACKAGE_LIBGPGME - help - podman is a CLI tool for spawning and running containers - according to the OCI specification. - - https://github.com/containers/podman - -if BR2_PACKAGE_PODMAN - -config BR2_PACKAGE_PODMAN_DRIVER_BTRFS - bool "btrfs filesystem driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS - help - Build the btrfs filesystem driver. - -config BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER - bool "devicemapper filesystem driver" - depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 - select BR2_PACKAGE_LVM2 - help - Build the devicemapper filesystem driver. - -config BR2_PACKAGE_PODMAN_DRIVER_VFS - bool "vfs filesystem driver" - depends on BR2_USE_WCHAR # gvfs - depends on BR2_USE_MMU # gvfs - depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs - depends on !BR2_STATIC_LIBS # gvfs - select BR2_PACKAGE_GVFS - help - Build the vfs filesystem driver. - -endif - -comment "podman needs a glibc or musl toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/podman/containers-policy.json b/package/podman/containers-policy.json deleted file mode 100644 index 4480eb82..00000000 --- a/package/podman/containers-policy.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "default": [ - { - "type": "insecureAcceptAnything" - } - ], - "transports": - { - "docker-daemon": - { - "": [{"type":"insecureAcceptAnything"}] - } - } -} diff --git a/package/podman/podman.hash b/package/podman/podman.hash deleted file mode 100644 index dade6f39..00000000 --- a/package/podman/podman.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 53f6bf7a8e4b647b2378ea8bfee6c67e03e412bf027b4dc0ff37a3a764703405 podman-4.9.5-go2.tar.gz -sha256 62fb8a3a9621dc2388174caaabe9c2317b694bb9a1d46c98bcf5655b68f51be3 LICENSE diff --git a/package/podman/podman.mk b/package/podman/podman.mk deleted file mode 100644 index 2fa70f7a..00000000 --- a/package/podman/podman.mk +++ /dev/null @@ -1,138 +0,0 @@ -################################################################################ -# -# podman -# -################################################################################ - -PODMAN_VERSION = 4.9.5 -PODMAN_SITE = $(call github,containers,podman,v$(PODMAN_VERSION)) -PODMAN_LICENSE = Apache-2.0 -PODMAN_LICENSE_FILES = LICENSE - -PODMAN_CPE_ID_VENDOR = podman_project -PODMAN_GOMOD = github.com/containers/podman/v4 - -PODMAN_BUILD_TARGETS = cmd/podman cmd/rootlessport cmd/quadlet -PODMAN_DEPENDENCIES += libgpgme -PODMAN_LDFLAGS = \ - -X $(PODMAN_GOMOD)/libpod/define.gitCommit=$(PODMAN_VERSION) -PODMAN_TAGS = \ - btrfs_noversion containers_image_openpgp \ - exclude_graphdriver_devicemapper exclude_graphdriver_zfs - -ifeq ($(BR2_INIT_SYSTEMD),y) -PODMAN_TAGS += systemd -endif - -ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) -PODMAN_DEPENDENCIES += libapparmor -PODMAN_TAGS += apparmor -endif - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -PODMAN_TAGS += seccomp -PODMAN_DEPENDENCIES += libseccomp host-pkgconf -else -define PODMAN_SECCOMP_PROFILE - $(INSTALL) -D -m 644 $(PODMAN_PKGDIR)/unconfined.conf \ - $(TARGET_DIR)/etc/containers/containers.conf -endef -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -PODMAN_TAGS += selinux -PODMAN_DEPENDENCIES += libselinux -endif - -ifeq ($(BR2_PACKAGE_PODMAN_DRIVER_BTRFS),y) -PODMAN_DEPENDENCIES += btrfs-progs -define PODMAN_BTFRS_DRIVER_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS) - $(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS_POSIX_ACL) -endef -else -PODMAN_TAGS += exclude_graphdriver_btrfs -endif - -ifeq ($(BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER),y) -PODMAN_DEPENDENCIES += lvm2 -define PODMAN_DEVICEMAPPER_DRIVER_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_MD) - $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_DM) - $(call KCONFIG_ENABLE_OPT,CONFIG_MD_THIN_PROVISIONING) -endef -else -PODMAN_TAGS += exclude_graphdriver_devicemapper -endif - -ifeq ($(BR2_PACKAGE_PODMAN_DRIVER_VFS),y) -PODMAN_DEPENDENCIES += gvfs -else -PODMAN_TAGS += exclude_graphdriver_vfs -endif - -ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) -define PODMAN_BASH_COMPLETION - $(INSTALL) -D -m 644 $(@D)/completions/bash/podman \ - $(TARGET_DIR)/usr/share/bash-completion/completions/ -endef -endif - -define PODMAN_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr \ - install.bin - $(INSTALL) -d -m 700 $(TARGET_DIR)/etc/cni - $(INSTALL) -d -m 700 $(TARGET_DIR)/etc/cni/net.d - $(INSTALL) -D -m 644 $(@D)/cni/87-podman-bridge.conflist \ - $(TARGET_DIR)/etc/cni/net.d/87-podman-bridge.conflist - $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/containers - $(INSTALL) -D -m 644 $(PODMAN_PKGDIR)/containers-policy.json \ - $(TARGET_DIR)/etc/containers/policy.json - $(PODMAN_SECCOMP_PROFILE) - $(PODMAN_BASH_COMPLETION) -endef - -define PODMAN_INSTALL_INIT_SYSTEMD - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr \ - install.systemd -endef - -define PODMAN_LINUX_CONFIG_FIXUPS - $(call KCONFIG_ENABLE_OPT,CONFIG_MEMCG) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_SCHED) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_FREEZER) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_DEVICE) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_CPUACCT) - $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUP_PIDS) - $(call KCONFIG_ENABLE_OPT,CONFIG_CPUSETS) - $(call KCONFIG_ENABLE_OPT,CONFIG_NAMESPACES) - $(call KCONFIG_ENABLE_OPT,CONFIG_UTS_NS) - $(call KCONFIG_ENABLE_OPT,CONFIG_IPC_NS) - $(call KCONFIG_ENABLE_OPT,CONFIG_PID_NS) - $(call KCONFIG_ENABLE_OPT,CONFIG_NET_NS) - $(call KCONFIG_ENABLE_OPT,CONFIG_USER_NS) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE_NETFILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_CONNTRACK) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_IPVS) - $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XT_MATCH_COMMENT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_NAT) - $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_TARGET_MASQUERADE) - $(call KCONFIG_ENABLE_OPT,CONFIG_BRIDGE) - $(call KCONFIG_ENABLE_OPT,CONFIG_NET_CORE) - $(call KCONFIG_ENABLE_OPT,CONFIG_VETH) - $(call KCONFIG_ENABLE_OPT,CONFIG_KEYS) - $(call KCONFIG_ENABLE_OPT,CONFIG_POSIX_MQUEUE) - $(call KCONFIG_ENABLE_OPT,CONFIG_OVERLAY_FS) - $(PODMAN_BTFRS_DRIVER_CONFIG_FIXUPS) - $(PODMAN_DEVICEMAPPER_DRIVER_CONFIG_FIXUPS) -endef - -$(eval $(golang-package)) diff --git a/package/podman/unconfined.conf b/package/podman/unconfined.conf deleted file mode 100644 index 9a6c6875..00000000 --- a/package/podman/unconfined.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Network] -network_backend = "cni" - -[containers] -seccomp_profile = "unconfined"