h21/HoralOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

(cherry picked from commit adbfbc22905593b82f6c5a2f271b2c7f2d53ec28)
This commit is contained in:
Neal Gompa
2026-02-25 17:11:03 -05:00
parent 749d86442a
commit 1576599e80
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiwi-build
-5
View File
@@ -63,11 +63,6 @@ if [ "$image_type" = "iso" ]; then
kiwibuild_extra_args="${kiwibuild_extra_args:+${kiwibuild_extra_args}} ${kiwibuild_iso_extra_args}" kiwibuild_extra_args="${kiwibuild_extra_args:+${kiwibuild_extra_args}} ${kiwibuild_iso_extra_args}"
fi fi
if [ "$image_type" = "oci" ]; then
# Extend for OCI images
kiwi_bundle_format="${kiwi_bundle_format}.%T"
fi
set +e set +e
if [ ! ${kiwi_isolated} ]; then if [ ! ${kiwi_isolated} ]; then
scripts/fedora-kiwi-bundle-format-generator
+1 -7
View File
@@ -14,7 +14,6 @@ import xml.etree.ElementTree as ET
parser = ArgumentParser(description="Generator of kiwi bundle formats for Fedora image builds") 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("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("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() args = parser.parse_args()
xml_tree = ET.parse(args.kiwi_file) xml_tree = ET.parse(args.kiwi_file)
@@ -23,9 +22,4 @@ image_root = xml_tree.getroot()
image_basename = image_root.attrib["name"] image_basename = image_root.attrib["name"]
image_profile = args.image_profile image_profile = args.image_profile
image_bundle_format = f"{image_basename}-{image_profile}-%v.%I.%A" print(f"{image_basename}-{image_profile}-%v.%I.%A")
if args.oci_variant:
print(f"{image_bundle_format}.%T")
else:
print(image_bundle_format)