From ba49c6f429510af421cbac166a8e89128486e040 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Mon, 28 Jun 2021 23:40:41 -0700 Subject: [PATCH] trying something --- common/extras.conf | 273 +++++++++++++++++++++++++++++++++++++++++++++ extras.conf | 193 +++++++------------------------- extras.conf.old | 49 -------- 3 files changed, 315 insertions(+), 200 deletions(-) create mode 100644 common/extras.conf delete mode 100644 extras.conf.old diff --git a/common/extras.conf b/common/extras.conf new file mode 100644 index 0000000..4a67c72 --- /dev/null +++ b/common/extras.conf @@ -0,0 +1,273 @@ +filter_packages = [ + ("^.*$", { + "*": [ + "*", + ] + }), +] + +filter_modules = [ + "*": [ + "*", + ] + }), +] + +additional_packages = [ + # Consolidation + ('^extras$', { + '*': [ + 'rpaste', + 'epel-release', + 'rpmfusion-free-release', + 'rocky-release-gluster9', + ], + }), + + ('^extras$', { + 'x86_64': [ + 'elrepo-release', + ], + 'aarch64': [ + "LibRaw", + "LibRaw-devel", + "alsa-sof-firmware", + "autocorr-af", + "autocorr-bg", + "autocorr-ca", + "autocorr-cs", + "autocorr-da", + "autocorr-de", + "autocorr-en", + "autocorr-es", + "autocorr-fa", + "autocorr-fi", + "autocorr-fr", + "autocorr-ga", + "autocorr-hr", + "autocorr-hu", + "autocorr-is", + "autocorr-it", + "autocorr-ja", + "autocorr-ko", + "autocorr-lb", + "autocorr-lt", + "autocorr-mn", + "autocorr-nl", + "autocorr-pl", + "autocorr-pt", + "autocorr-ro", + "autocorr-ru", + "autocorr-sk", + "autocorr-sl", + "autocorr-sr", + "autocorr-sv", + "autocorr-tr", + "autocorr-vi", + "autocorr-zh", + "brasero", + "brasero-nautilus", + "cheese", + "edk2-ovmf", + "eog", + "flute", + "fprintd", + "fprintd-pam", + "gegl04", + "gegl04-devel", + "gfbgraph", + "gnome-color-manager", + "gnome-online-miners", + "gnome-photos", + "gnome-photos-tests", + "gnome-video-effects", + "gom", + "grilo-plugins", + "gupnp-av", + "gupnp-dlna", + "hexchat", + "hexchat-devel", + "hyperv-daemons-license", + "hyperv-tools", + "libreoffice-base", + "libreoffice-calc", + "libreoffice-core", + "libreoffice-data", + "libreoffice-draw", + "libreoffice-emailmerge", + "libreoffice-filters", + "libreoffice-gdb-debug-support", + "libreoffice-graphicfilter", + "libreoffice-gtk3", + "libreoffice-help-ar", + "libreoffice-help-bg", + "libreoffice-help-bn", + "libreoffice-help-ca", + "libreoffice-help-cs", + "libreoffice-help-da", + "libreoffice-help-de", + "libreoffice-help-dz", + "libreoffice-help-el", + "libreoffice-help-en", + "libreoffice-help-es", + "libreoffice-help-et", + "libreoffice-help-eu", + "libreoffice-help-fi", + "libreoffice-help-fr", + "libreoffice-help-gl", + "libreoffice-help-gu", + "libreoffice-help-he", + "libreoffice-help-hi", + "libreoffice-help-hr", + "libreoffice-help-hu", + "libreoffice-help-id", + "libreoffice-help-it", + "libreoffice-help-ja", + "libreoffice-help-ko", + "libreoffice-help-lt", + "libreoffice-help-lv", + "libreoffice-help-nb", + "libreoffice-help-nl", + "libreoffice-help-nn", + "libreoffice-help-pl", + "libreoffice-help-pt-BR", + "libreoffice-help-pt-PT", + "libreoffice-help-ro", + "libreoffice-help-ru", + "libreoffice-help-si", + "libreoffice-help-sk", + "libreoffice-help-sl", + "libreoffice-help-sv", + "libreoffice-help-ta", + "libreoffice-help-tr", + "libreoffice-help-uk", + "libreoffice-help-zh-Hans", + "libreoffice-help-zh-Hant", + "libreoffice-impress", + "libreoffice-langpack-af", + "libreoffice-langpack-ar", + "libreoffice-langpack-as", + "libreoffice-langpack-bg", + "libreoffice-langpack-bn", + "libreoffice-langpack-br", + "libreoffice-langpack-ca", + "libreoffice-langpack-cs", + "libreoffice-langpack-cy", + "libreoffice-langpack-da", + "libreoffice-langpack-de", + "libreoffice-langpack-dz", + "libreoffice-langpack-el", + "libreoffice-langpack-en", + "libreoffice-langpack-es", + "libreoffice-langpack-et", + "libreoffice-langpack-eu", + "libreoffice-langpack-fa", + "libreoffice-langpack-fi", + "libreoffice-langpack-fr", + "libreoffice-langpack-ga", + "libreoffice-langpack-gl", + "libreoffice-langpack-gu", + "libreoffice-langpack-he", + "libreoffice-langpack-hi", + "libreoffice-langpack-hr", + "libreoffice-langpack-hu", + "libreoffice-langpack-id", + "libreoffice-langpack-it", + "libreoffice-langpack-ja", + "libreoffice-langpack-kk", + "libreoffice-langpack-kn", + "libreoffice-langpack-ko", + "libreoffice-langpack-lt", + "libreoffice-langpack-lv", + "libreoffice-langpack-mai", + "libreoffice-langpack-ml", + "libreoffice-langpack-mr", + "libreoffice-langpack-nb", + "libreoffice-langpack-nl", + "libreoffice-langpack-nn", + "libreoffice-langpack-nr", + "libreoffice-langpack-nso", + "libreoffice-langpack-or", + "libreoffice-langpack-pa", + "libreoffice-langpack-pl", + "libreoffice-langpack-pt-BR", + "libreoffice-langpack-pt-PT", + "libreoffice-langpack-ro", + "libreoffice-langpack-ru", + "libreoffice-langpack-si", + "libreoffice-langpack-sk", + "libreoffice-langpack-sl", + "libreoffice-langpack-sr", + "libreoffice-langpack-ss", + "libreoffice-langpack-st", + "libreoffice-langpack-sv", + "libreoffice-langpack-ta", + "libreoffice-langpack-te", + "libreoffice-langpack-th", + "libreoffice-langpack-tn", + "libreoffice-langpack-tr", + "libreoffice-langpack-ts", + "libreoffice-langpack-uk", + "libreoffice-langpack-ve", + "libreoffice-langpack-xh", + "libreoffice-langpack-zh-Hans", + "libreoffice-langpack-zh-Hant", + "libreoffice-langpack-zu", + "libreoffice-math", + "libreoffice-ogltrans", + "libreoffice-opensymbol-fonts", + "libreoffice-pdfimport", + "libreoffice-pyuno", + "libreoffice-sdk", + "libreoffice-sdk-doc", + "libreoffice-ure", + "libreoffice-ure-common", + "libreoffice-voikko", + "libreoffice-wiki-publisher", + "libreoffice-writer", + "libreoffice-x11", + "libreoffice-xsltfilter", + "libreofficekit", + "libabw", + "libbase", + "libcdr", + "libcmis", + "libdmapsharing", + "libexttextcat", + "libfonts", + "libformula", + "libfprint", + "libfreehand", + "liblayout", + "libloader", + "libmediaart", + "libmspub", + "libmwaw", + "liborcus", + "libpagemaker", + "libqxp", + "librepository", + "libserializer", + "libstaroffice", + "libzmf", + "lpsolve", + "mesa-vulkan-drivers", + "pidgin", + "pidgin-devel", + "pidgin-sipe", + "redhat-menus", + "rhythmbox", + "sac", + "seabios-bin", + "seavgabios-bin", + "sgabios-bin", + "spice-qxl-wddm-dod", + "syslinux-extlinux-nonlinux", + "syslinux-nonlinux", + "syslinux-tftpboot", + "totem", + "totem-nautilus", + "virtio-win", + ] + }), +] diff --git a/extras.conf b/extras.conf index 0b24849..335237c 100644 --- a/extras.conf +++ b/extras.conf @@ -1,160 +1,51 @@ -from common/multilib import * -from common/include-excludes import * +from common/extras import * -# PRODUCT INFO -release_name = "Rocky Linux Extras" +release_name = "Rocky Linux Extras" release_short = "Extras" release_version = "8" -version = "8-Extras" +release_is_layered = False -skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files'] - -# GENERAL SETTINGS - comps_file = { - 'scm': 'git', - 'repo': 'https://git.rockylinux.org/rocky/comps.git', - 'branch': 'main', - 'file': 'comps-rocky-8.4.xml', - } - -#link_type = 'hardlink-or-copy' -link_type = 'copy' - -module_defaults_dir = { - 'scm': 'git', - 'repo': 'https://git.rockylinux.org/rocky/rocky-module-defaults.git', - 'branch': 'r8.4', - 'dir': '.', -} - -multilib = [ - ('^.*$', { - 'x86_64': ['devel', 'runtime'] - }), -] - -variants_file = 'variants-extras.xml' +variants_file='variants-extras.xml' sigkeys = ['6D745A60'] -hashed_directories = False - -# tree_arches = ['aarch64', 'i386', 'ppc64le', 'x86_64'] -tree_arches = ['aarch64', 'i386', 'x86_64'] - -# PKGSET -pkgset_source = "koji" -koji_profile = "koji" - -# PKGSET - KOJI -pkgset_koji_tag = "dist-rocky8-compose" -pkgset_koji_inherit = False -pkgset_koji_module_tag = "modular-updates-candidate" - -filter_system_release_packages = False - -# GATHER -gather_prepopulate = "rocky-packages.json" - -gather_method = { - "^(?!(AppStream|PowerTools)).*$":{ - "comps": "deps" - }, - "^(AppStream|PowerTools)$": "hybrid", -} - -gather_backend = "dnf" -check_deps = False -greedy_method = "none" -repoclosure_backend = "dnf" - -# CREATEREPO -createrepo_deltas = False -createrepo_database = True -createrepo_c = True -createrepo_checksum = "sha256" -createrepo_use_xz = True -createrepo_num_threads = 8 -createrepo_num_workers = 4 - -# CHECKSUMS -media_checksums = ['sha256'] -media_checksum_one_file = True create_jigdo = False +pkgset_source='koji' -buildinstall_skip = [ - ("^(extras|AppStream|PowerTools|HighAvailability|ResilientStorage)$", { - "*": True - }), +pkgset_koji_tag='dist-rocky8-compose' +gather_method = { + '^.*': { # For all variants + 'comps': 'nodeps', # resolve dependencies for packages from comps file + 'module': 'nodeps', # but not for packages from modules + } +} + +gather_backend = 'dnf' +greedy_method = 'build' +koji_profile = "koji" + +check_deps = False + +#filter_packages = [ +# ('^extras$', { +# '*': [ +# 'rocky-gpg-keys', +# 'rocky-repos', +# ], +# }), +#] + +#additional_packages = [ +# ('^extras$', { +# '*': [ +# '*', +# ], +# }), +#] + +createiso_skip = [ + + ('^extras$', { + '*': True, + 'src': True + }), ] - -# LOOKASIDE -variant_as_lookaside = [ -] - -gather_lookaside_repos = [ - ("^extras$", { - "x86_64": [ - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/x86_64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/x86_64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/x86_64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/x86_64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/x86_64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/x86_64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/x86_64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/x86_64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/x86_64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/x86_64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/source/tree", - ], - "ppc64": [ - ], - "ppc64le": [ - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/ppc64le/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/ppc64le/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/ppc64le/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/ppc64le/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/ppc64le/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/ppc64le/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/ppc64le/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/ppc64le/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/ppc64le/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/ppc64le/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/source/tree", - ], - "s390x": [ - ], - "aarch64": [ - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/aarch64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/aarch64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/BaseOS/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/aarch64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/aarch64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/AppStream/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/aarch64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/aarch64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/PowerTools/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/aarch64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/aarch64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/HighAvailability/source/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/aarch64/os", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/aarch64/debug/tree", - "file:///mnt/compose/8/latest-Rocky-8/compose/ResilientStorage/source/tree", - ], - }), -] - -productimg = False - -translate_paths = [ - ("/mnt/koji", "https://koji.rockylinux.org/kojifiles") - # ("/compose", "http://172.22.0.123/compose"), -] - diff --git a/extras.conf.old b/extras.conf.old deleted file mode 100644 index 6315ae2..0000000 --- a/extras.conf.old +++ /dev/null @@ -1,49 +0,0 @@ -release_name = "Rocky Linux Extras" -release_short = "Extras" -release_version = "8" -release_is_layered = False - -variants_file='variants-extras.xml' -sigkeys = ['6D745A60'] -create_jigdo = False - -pkgset_source='koji' - -pkgset_koji_tag='dist-rocky8-extras-compose' -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' -greedy_method = 'build' -koji_profile = "koji" - -check_deps = False - -filter_packages = [ - ('^extras$', { - '*': [ - 'rocky-gpg-keys', - 'rocky-repos', - ], - }), -] - -additional_packages = [ - ('^extras$', { - '*': [ - '*', - ], - }), -] - -createiso_skip = [ - - ('^extras$', { - '*': True, - 'src': True - }), -]