From 1242f72efae825689b79f04fa3fe92162667f6f0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 11 2020 12:40:06 +0000 Subject: Updates to pungi config for F-32+ Signed-off-by: Peter Robinson --- diff --git a/fedora-iot.conf b/fedora-iot.conf index 3ecde31..26f79b9 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -4,7 +4,7 @@ release_short = 'Fedora-IoT' release_version = '32' # Let's not build install media during this run. For the image builds # and OSTree installer we'll use inputs from other f32 runs. -skip_phases = ["buildinstall", "productimg", "gather", "extra_files"] +skip_phases = ["buildinstall", "gather", "extra_files"] ostree_installer_overwrite = True # GENERAL SETTINGS @@ -17,16 +17,19 @@ comps_file = { } variants_file='variants-fedora.xml' sigkeys = ['12C944D0'] + # limit tree architectures # if undefined, all architectures from variants.xml will be included -# tree_arches = ['aarch64', 'armhfp', 'x86_64'] +tree_arches = ['aarch64', 'armhfp', 'x86_64'] # limit tree variants # if undefined, all variants from variants.xml will be included tree_variants = ['IoT'] hashed_directories = True + # RUNROOT settings runroot_channel = 'compose' runroot_tag = 'f32-build' + # PKGSET pkgset_source = 'koji' # koji, repos @@ -35,24 +38,35 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -#pkgset_koji_tag = 'f32-atomic' pkgset_koji_tag = 'f32-iot' pkgset_koji_inherit = False filter_system_release_packages = False # GATHER -gather_method = 'deps' +gather_method = { + '^.*': { # For all variants + 'comps': 'deps', # resolve dependencies for packages from comps file + 'module': 'nodeps', # but not for packages from modules + } +} +gather_backend = 'dnf' gather_profiler = True check_deps = False greedy_method = 'build' + +repoclosure_backend = 'dnf' + # CREATEREPO -createrepo_c = True -createrepo_checksum = 'sha256' +createrepo_deltas = False +createrepo_database = True +createrepo_use_xz = True +createrepo_num_workers = 10 + # CHECKSUMS media_checksums = ['sha256'] media_checksum_one_file = True -media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s' +media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(arch)s-%(date)s%(type_suffix)s.%(respin)s' #jigdo create_jigdo = False @@ -64,12 +78,11 @@ buildinstall_skip = [ }), ] -# Enables macboot on x86_64 for all variants and disables upgrade image building -# # everywhere. +# disables macboot and upgrade image building lorax_options = [ ('^.*$', { 'x86_64': { - 'nomacboot': False + 'nomacboot': True }, '*': { 'noupgrade': True @@ -77,8 +90,6 @@ lorax_options = [ }) ] -# We just grab everything, since everything that's gather'ed is meant as an -# override. additional_packages = [ ('^IoT$$', { '*': [ @@ -97,11 +108,12 @@ filter_packages = [] multilib_blacklist = { '*': ['kernel', 'kernel-PAE*', 'kernel*debug*', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', - 'php-devel', 'java-*', + 'php-devel', 'java-*', 'bash-devel', 'httpd-devel', 'tomcat-native', 'php*', 'httpd', 'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*' ], } + # format: {arch|*: [packages]} multilib_whitelist = { '*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper', @@ -110,33 +122,24 @@ multilib_whitelist = { 'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs', 'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc', 'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust', - 'mariadb-connector-odbc', 'compiler-rt' + 'mariadb-connector-odbc', 'compiler-rt', + 'nvidia-query-resource-opengl-lib', + 'ibus-libs', 'ibus-gtk2', 'ibus-gtk3', + 'glib-networking' ], } -createiso_skip = [ - ('^Workstation$', { - '*': True, - 'src': True - }), - - ('^Server$', { - 'src': True - }), +createiso_skip = [ ('^Everything$', { '*': True, 'src': True }), - ('^Modular$', { - '*': True, - 'src': True - }), ] # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})] #extra_files = [ -# ('^(Server|Workstation)$', { +# ('^(Server)$', { # '*': [ # { # 'scm': 'rpm', @@ -150,11 +153,12 @@ createiso_skip = [ # ], # }), #] + # Image name respecting Fedora's image naming policy -image_name_format = 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s.%(respin)s.iso' +image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' # # Use the same format for volume id image_volid_formats = [ - 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' + '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' ] # No special handling for layered products, use same format as for regular images image_volid_layered_product_formats = [] @@ -170,10 +174,10 @@ volume_id_substitutions = { 'Beta': 'B', 'Rawhide': 'rawh', 'Astronomy_KDE': 'AstK', - 'AtomicHost': 'AH', - 'AtomicWorkstation': 'AW', + 'Silverblue': 'SB', 'Cinnamon': 'Cinn', 'Cloud': 'C', + 'Comp_Neuro': 'CNr', 'Design_suite': 'Dsgn', 'Electronic_Lab': 'Elec', 'Everything': 'E', @@ -198,7 +202,7 @@ disc_types = { } translate_paths = [ - ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'), + ('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'), ] # These will be inherited by live_media, live_images and image_build @@ -207,6 +211,7 @@ global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_version = '32' # live_images ignores this in favor of live_target global_target = 'f32' + image_build = { '^IoT$': [ { @@ -228,42 +233,42 @@ ostree = [ ("^IoT$", { "aarch64": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "master", - "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" - ] + "repo": "Everything", "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", - 'failable': ['*'], - 'update_summary': True, + "ostree_ref": "fedora/rawhide/${basearch}/iot", + "failable": ['*'], + "update_summary": True, }, "armhfp": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "master", - "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" - ] + "repo": "Everything", "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", - 'failable': ['*'], - 'update_summary': True, + "ostree_ref": "fedora/rawhide/${basearch}/iot", + "failable": ['*'], + "update_summary": True, }, "x86_64": { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, "treefile": "fedora-iot.json", "config_url": "https://pagure.io/fedora-iot/ostree.git", "config_branch": "master", - "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" - ] + "repo": "Everything", "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", - 'failable': ['*'], - 'update_summary': True, + "ostree_ref": "fedora/rawhide/${basearch}/iot", + "failable": ['*'], + "update_summary": True, } }) ] @@ -271,9 +276,7 @@ ostree = [ ostree_installer = [ ("^IoT$", { "aarch64": { - "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" - ], + "repo": "Everything", "release": None, "rootfs_size": "4", "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", @@ -291,9 +294,7 @@ ostree_installer = [ 'template_branch': 'master', }, "armhfp": { - "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" - ], + "repo": "Everything", "release": None, "rootfs_size": "4", "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", @@ -311,9 +312,7 @@ ostree_installer = [ 'template_branch': 'master', }, "x86_64": { - "repo": [ - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/" - ], + "repo": "Everything", "release": None, "rootfs_size": "4", "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", @@ -332,4 +331,5 @@ ostree_installer = [ } }) ] + koji_profile = 'compose_koji'