diff --git a/fedora.conf b/fedora.conf
index 36c4f66..24281be 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -16,18 +16,6 @@ comps_file = {
'file': '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'
sigkeys = ['18B8e74c']
@@ -54,7 +42,6 @@ pkgset_koji_inherit = False
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'
@@ -89,9 +76,6 @@ createiso_use_xorrisofs = True
# BUILDINSTALL
buildinstall_method = 'lorax'
buildinstall_skip = [
- ('^Modular$', {
- '*': True
- }),
('^Everything$', {
'i386': True
}),
@@ -176,15 +160,6 @@ filter_packages = [
}),
]
-filter_modules = [
- ('(Modular)$', {
- '*': [
- 'perl*bootstrap:*',
- 'rpm:*',
- ]
- }),
-]
-
createiso_skip = [
('^Server$', {
'src': True
@@ -194,12 +169,6 @@ createiso_skip = [
'*': True,
'src': True
}),
-
- ('^Modular$', {
- '*': True,
- 'src': True
- }),
-
]
# format: [(variant_uid_regex, {arch|*: [scm_dicts]})]
diff --git a/nightly.sh b/nightly.sh
index e7e2c2c..41a9b83 100755
--- a/nightly.sh
+++ b/nightly.sh
@@ -121,13 +121,12 @@ send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start
if [ ! -d "$RSYNCTARGET" ]; then
mkdir "$RSYNCTARGET"
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 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything \
--variant Cloud \
--variant Container \
- --variant Modular \
--variant Server \
--variant Spins \
--variant Silverblue \
@@ -141,7 +140,6 @@ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \
--variant Everything \
--variant Cloud \
--variant Container \
- --variant Modular \
--variant Server \
--variant Spins \
--variant Silverblue \
@@ -184,12 +182,12 @@ fi
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--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
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--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
$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
diff --git a/variants-fedora.xml b/variants-fedora.xml
index 1b112e8..df51ed4 100644
--- a/variants-fedora.xml
+++ b/variants-fedora.xml
@@ -105,16 +105,4 @@
x86_64
-
-
- armhfp
- aarch64
- ppc64le
- s390x
- x86_64
-
-
- f39-modular
-
-