[PATCH v2 1/2] imagetypes_container: Drop oci type

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

This format was supported since the introduction of container images but
it was never documented. After revisiting its content and potential
purpose, it turned out that its use case would be rather theoretical and
that it can't be imported into common container services. So simply drop
it as "practically irrelevant".

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
RECIPE-API-CHANGELOG.md | 5 +++++
doc/user_manual.md | 2 +-
meta/classes/imagetypes_container.bbclass | 6 +-----
3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index a4cf1338..8468717d 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -722,3 +722,8 @@ Optional fields of the isar-apt repo can be controlled by adding to the

Changes in next
---------------
+
+### Drop unused container image format `oci`
+
+This was never documented and never had practical relevance. `oci-archive` is
+the useful OCI image format that can be imported, e.g., by podman.
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 845823bb..ceac8294 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -273,7 +273,7 @@ https://github.com/intel/bmap-tools
### Generate container image with root filesystem

A runnable container image is generated if IMAGE_FSTYPES variable includes
-one of the supported container formats `oci`, `oci-archive`, `docker-archive`,
+one of the supported container formats `oci-archive`, `docker-archive`,
`docker-daemon`, or `containers-storage`.
Getting a container image can be the main purpose of an Isar configuration,
but not only.
diff --git a/meta/classes/imagetypes_container.bbclass b/meta/classes/imagetypes_container.bbclass
index 1a6f3669..60b65bd8 100644
--- a/meta/classes/imagetypes_container.bbclass
+++ b/meta/classes/imagetypes_container.bbclass
@@ -6,7 +6,7 @@
# This class provides the task 'containerize'
# to create container images containing the target rootfs.

-CONTAINER_TYPES = "oci oci-archive docker-archive docker-daemon containers-storage"
+CONTAINER_TYPES = "oci-archive docker-archive docker-daemon containers-storage"
USING_CONTAINER = "${@bb.utils.contains_any('IMAGE_BASETYPES', d.getVar('CONTAINER_TYPES').split(), '1', '0', d)}"

CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}"
@@ -87,10 +87,6 @@ convert_container() {
--tmpdir "${WORKDIR}" \
"oci:${oci_img_dir}:${tag}" "${target}"
;;
- "oci")
- tar --create --directory "${oci_img_dir}" \
- --file "${image_archive}" .
- ;;
"docker-daemon" | "containers-storage")
if [ -f /.dockerenv ] || [ -f /run/.containerenv ] ; then
die "Adding the container image to a container runtime (${container_type}) not supported if running from a container (e.g. 'kas-container')"
--
2.43.0