kiwi-build, scripts: Drop unnecessary override for OCI artifacts

The underlying issue that required this was fixed in kiwi-10.2.17.

2 files changed, 1 insertions, 12 deletions

diff --git a/kiwi-build b/kiwi-build
index 163565c..88358f5 100755
--- a/kiwi-build
+++ b/kiwi-build
@@ -63,11 +63,6 @@ if [ "$image_type" = "iso" ]; then
 	kiwibuild_extra_args="${kiwibuild_extra_args:+${kiwibuild_extra_args}} ${kiwibuild_iso_extra_args}"
 fi
 
-if [ "$image_type" = "oci" ]; then
-	# Extend for OCI images
-	kiwi_bundle_format="${kiwi_bundle_format}.%T"
-fi
-
 
 set +e
 if [ ! ${kiwi_isolated} ]; then
diff --git a/scripts/fedora-kiwi-bundle-format-generator b/scripts/fedora-kiwi-bundle-format-generator
index a03d253..7c48324 100755
--- a/scripts/fedora-kiwi-bundle-format-generator
+++ b/scripts/fedora-kiwi-bundle-format-generator
@@ -14,7 +14,6 @@ import xml.etree.ElementTree as ET
 parser = ArgumentParser(description="Generator of kiwi bundle formats for Fedora image builds")
 parser.add_argument("kiwi_file", type=Path, default="Fedora.kiwi", help="kiwi description file")
 parser.add_argument("image_profile", type=str, help="kiwi image profile")
-parser.add_argument("--oci-variant", "-o", action="store_true", help="generate oci variant")
 args = parser.parse_args()
 
 xml_tree = ET.parse(args.kiwi_file)
@@ -23,9 +22,4 @@ image_root = xml_tree.getroot()
 image_basename = image_root.attrib["name"]
 image_profile = args.image_profile
 
-image_bundle_format = f"{image_basename}-{image_profile}-%v.%I.%A"
-
-if args.oci_variant:
-	print(f"{image_bundle_format}.%T")
-else:
-	print(image_bundle_format)
+print(f"{image_basename}-{image_profile}-%v.%I.%A")