diff --git a/common/include-excludes.conf b/common/include-excludes.conf index 98eb85c..4e74244 100644 --- a/common/include-excludes.conf +++ b/common/include-excludes.conf @@ -1,5 +1,5 @@ filter_packages = [ - ("^(BaseOS|AppStream|HighAvailability|ResilientStorage|extras|Devel|plus)$", { + ("^(BaseOS|AppStream|HighAvailability|ResilientStorage)$", { "*": [ "python36", "gcc-toolset-9-*-testsuite", diff --git a/extras.conf b/extras.conf index 6315ae2..0b24849 100644 --- a/extras.conf +++ b/extras.conf @@ -1,49 +1,160 @@ -release_name = "Rocky Linux Extras" +from common/multilib import * +from common/include-excludes import * + +# PRODUCT INFO +release_name = "Rocky Linux Extras" release_short = "Extras" release_version = "8" -release_is_layered = False +version = "8-Extras" -variants_file='variants-extras.xml' -sigkeys = ['6D745A60'] -create_jigdo = False +skip_phases = ['buildinstall','productimg','createiso','extra_isos','extra_files'] -pkgset_source='koji' +# GENERAL SETTINGS + comps_file = { + 'scm': 'git', + 'repo': 'https://git.rockylinux.org/rocky/comps.git', + 'branch': 'main', + 'file': 'comps-rocky-8.4.xml', + } -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 - } +#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': '.', } -gather_backend = 'dnf' -greedy_method = 'build' +multilib = [ + ('^.*$', { + 'x86_64': ['devel', 'runtime'] + }), +] + +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" -check_deps = False +# PKGSET - KOJI +pkgset_koji_tag = "dist-rocky8-compose" +pkgset_koji_inherit = False +pkgset_koji_module_tag = "modular-updates-candidate" -filter_packages = [ - ('^extras$', { - '*': [ - 'rocky-gpg-keys', - 'rocky-repos', +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 + + +buildinstall_skip = [ + ("^(extras|AppStream|PowerTools|HighAvailability|ResilientStorage)$", { + "*": 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", ], }), ] -additional_packages = [ - ('^extras$', { - '*': [ - '*', - ], - }), +productimg = False + +translate_paths = [ + ("/mnt/koji", "https://koji.rockylinux.org/kojifiles") + # ("/compose", "http://172.22.0.123/compose"), ] -createiso_skip = [ - - ('^extras$', { - '*': True, - 'src': True - }), -] diff --git a/extras.conf.old b/extras.conf.old new file mode 100644 index 0000000..6315ae2 --- /dev/null +++ b/extras.conf.old @@ -0,0 +1,49 @@ +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 + }), +] diff --git a/r8.conf b/r8.conf index bd3dcbb..14f1e54 100644 --- a/r8.conf +++ b/r8.conf @@ -104,7 +104,7 @@ lorax_options = [ buildinstall_skip = [ #("^(AppStream|PowerTools|HighAvailability|ResilientStorage)$", { - ("^(AppStream|PowerTools|HighAvailability|ResilientStorage|extras|Devel|plus)$", { + ("^(AppStream|PowerTools|HighAvailability|ResilientStorage)$", { "*": True }), ] @@ -122,7 +122,7 @@ create_optional_isos = False createiso_skip = [ #('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage)$', { - ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage|extras|Devel|plus)$', { + ('^(BaseOS|AppStream|Minimal|PowerTools|HighAvailability|ResilientStorage)$', { '*': True, 'src':True }), diff --git a/variants.xml b/variants.xml index 8e30d8d..321e6d5 100644 --- a/variants.xml +++ b/variants.xml @@ -315,29 +315,4 @@ - - - - aarch64 - ppc64le - x86_64 - - - - - - aarch64 - ppc64le - x86_64 - - - - - - aarch64 - ppc64le - x86_64 - - -