Remove modularity
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
This commit is contained in:
parent
8cd1f08e24
commit
ff110ad456
31
fedora.conf
31
fedora.conf
|
@ -16,18 +16,6 @@ comps_file = {
|
||||||
'file': 'comps-rawhide.xml',
|
'file': 'comps-rawhide.xml',
|
||||||
'command': 'make comps-rawhide.xml'
|
'command': 'make comps-rawhide.xml'
|
||||||
}
|
}
|
||||||
module_defaults_dir = {
|
|
||||||
'scm': 'git',
|
|
||||||
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
|
|
||||||
'branch': 'main',
|
|
||||||
'dir': '.'
|
|
||||||
}
|
|
||||||
module_obsoletes_dir = {
|
|
||||||
'scm': 'git',
|
|
||||||
'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
|
|
||||||
'branch': 'main',
|
|
||||||
'dir': 'obsoletes'
|
|
||||||
}
|
|
||||||
|
|
||||||
variants_file='variants-fedora.xml'
|
variants_file='variants-fedora.xml'
|
||||||
sigkeys = ['18B8e74c']
|
sigkeys = ['18B8e74c']
|
||||||
|
@ -54,7 +42,6 @@ pkgset_koji_inherit = False
|
||||||
gather_method = {
|
gather_method = {
|
||||||
'^.*': { # For all variants
|
'^.*': { # For all variants
|
||||||
'comps': 'deps', # resolve dependencies for packages from comps file
|
'comps': 'deps', # resolve dependencies for packages from comps file
|
||||||
'module': 'nodeps', # but not for packages from modules
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gather_backend = 'dnf'
|
gather_backend = 'dnf'
|
||||||
|
@ -89,9 +76,6 @@ createiso_use_xorrisofs = True
|
||||||
# BUILDINSTALL
|
# BUILDINSTALL
|
||||||
buildinstall_method = 'lorax'
|
buildinstall_method = 'lorax'
|
||||||
buildinstall_skip = [
|
buildinstall_skip = [
|
||||||
('^Modular$', {
|
|
||||||
'*': True
|
|
||||||
}),
|
|
||||||
('^Everything$', {
|
('^Everything$', {
|
||||||
'i386': True
|
'i386': True
|
||||||
}),
|
}),
|
||||||
|
@ -176,15 +160,6 @@ filter_packages = [
|
||||||
}),
|
}),
|
||||||
]
|
]
|
||||||
|
|
||||||
filter_modules = [
|
|
||||||
('(Modular)$', {
|
|
||||||
'*': [
|
|
||||||
'perl*bootstrap:*',
|
|
||||||
'rpm:*',
|
|
||||||
]
|
|
||||||
}),
|
|
||||||
]
|
|
||||||
|
|
||||||
createiso_skip = [
|
createiso_skip = [
|
||||||
('^Server$', {
|
('^Server$', {
|
||||||
'src': True
|
'src': True
|
||||||
|
@ -194,12 +169,6 @@ createiso_skip = [
|
||||||
'*': True,
|
'*': True,
|
||||||
'src': True
|
'src': True
|
||||||
}),
|
}),
|
||||||
|
|
||||||
('^Modular$', {
|
|
||||||
'*': True,
|
|
||||||
'src': True
|
|
||||||
}),
|
|
||||||
|
|
||||||
]
|
]
|
||||||
|
|
||||||
# format: [(variant_uid_regex, {arch|*: [scm_dicts]})]
|
# format: [(variant_uid_regex, {arch|*: [scm_dicts]})]
|
||||||
|
|
|
@ -121,13 +121,12 @@ send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start
|
||||||
if [ ! -d "$RSYNCTARGET" ]; then
|
if [ ! -d "$RSYNCTARGET" ]; then
|
||||||
mkdir "$RSYNCTARGET"
|
mkdir "$RSYNCTARGET"
|
||||||
fi
|
fi
|
||||||
# aarch64/x86_64 for Everything Cloud Container Modular Server Workstation is primary
|
# aarch64/x86_64 for Everything Cloud Container Server Workstation is primary
|
||||||
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \
|
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \
|
||||||
"$DESTDIR" "$RSYNCTARGET/" \
|
"$DESTDIR" "$RSYNCTARGET/" \
|
||||||
--variant Everything \
|
--variant Everything \
|
||||||
--variant Cloud \
|
--variant Cloud \
|
||||||
--variant Container \
|
--variant Container \
|
||||||
--variant Modular \
|
|
||||||
--variant Server \
|
--variant Server \
|
||||||
--variant Spins \
|
--variant Spins \
|
||||||
--variant Silverblue \
|
--variant Silverblue \
|
||||||
|
@ -141,7 +140,6 @@ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \
|
||||||
--variant Everything \
|
--variant Everything \
|
||||||
--variant Cloud \
|
--variant Cloud \
|
||||||
--variant Container \
|
--variant Container \
|
||||||
--variant Modular \
|
|
||||||
--variant Server \
|
--variant Server \
|
||||||
--variant Spins \
|
--variant Spins \
|
||||||
--variant Silverblue \
|
--variant Silverblue \
|
||||||
|
@ -184,12 +182,12 @@ fi
|
||||||
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
|
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
|
||||||
"$DESTDIR" "$RSYNCSECTARGET/" \
|
"$DESTDIR" "$RSYNCSECTARGET/" \
|
||||||
--variant Everything --variant Cloud --variant Container \
|
--variant Everything --variant Cloud --variant Container \
|
||||||
--variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
|
--variant Labs --variant Server --variant Spins --variant Workstation \
|
||||||
--link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata
|
--link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata
|
||||||
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
|
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
|
||||||
"$DESTDIR" "$RSYNCSECTARGET/" \
|
"$DESTDIR" "$RSYNCSECTARGET/" \
|
||||||
--variant Everything --variant Cloud --variant Container \
|
--variant Everything --variant Cloud --variant Container \
|
||||||
--variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
|
--variant Labs --variant Server --variant Spins --variant Workstation \
|
||||||
--link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after
|
--link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after
|
||||||
|
|
||||||
$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
|
$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
|
||||||
|
|
|
@ -105,16 +105,4 @@
|
||||||
<arch>x86_64</arch>
|
<arch>x86_64</arch>
|
||||||
</arches>
|
</arches>
|
||||||
</variant>
|
</variant>
|
||||||
<variant id="Modular" name="Modular" type="variant">
|
|
||||||
<arches>
|
|
||||||
<arch>armhfp</arch>
|
|
||||||
<arch>aarch64</arch>
|
|
||||||
<arch>ppc64le</arch>
|
|
||||||
<arch>s390x</arch>
|
|
||||||
<arch>x86_64</arch>
|
|
||||||
</arches>
|
|
||||||
<modules>
|
|
||||||
<kojitag>f39-modular</kojitag>
|
|
||||||
</modules>
|
|
||||||
</variant>
|
|
||||||
</variants>
|
</variants>
|
||||||
|
|
Loading…
Reference in New Issue