From 5e83ee3372eedc70d10ff3d57f8c5bf6f272047e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Aug 25 2024 16:48:32 +0000 Subject: Use our own structure for the volume and application IDs for KDE Mobile The variables referenced don't exist outside of a specific contexts (that the kiwibuild configuration section is not part of), so "reimplement" the structure instead. Signed-off-by: Neal Gompa --- diff --git a/fedora.conf b/fedora.conf index a1a0e95..f0ff5d8 100644 --- a/fedora.conf +++ b/fedora.conf @@ -212,6 +212,8 @@ kiwibuild_description_path = 'Fedora.kiwi' # config file, the other specifiers are passed through to kiwi kiwibuild_bundle_name_format = '%%N-%s-%%I.%%A' % global_version +# custom variable to make things easier +KIWI_ISO_VOLID_VERSION = 'rawh' image_build = { '^Labs$': [ @@ -467,8 +469,8 @@ kiwibuild = { 'subvariant': 'KDE_Mobile', 'type': 'iso', 'type_attr': [ - 'volid=%s-KDEM-%s-%s-%s' % (release_short, disc_type, arch, version), - 'application_id=%s-KDE_Mobile-%s-%s-%s' % (release, disc_type, arch, version), + 'volid=%s-KDEM-Live-%s-%s' % (release_short, KIWI_ISO_VOLID_VERSION, global_release), + 'application_id=%s-KDE_Mobile-Live-%s-%s' % (release_short, global_version, global_release), ], 'failable': ['*'], }