PR#1186: Remove modularity - pungi-fedora

pungi-fedora

#1186 Remove modularity

Merged 9 months ago by humaton. Opened 10 months ago by humaton.

humaton/pungi-fedora remove_modularity into main

Remove modularity

Tomas Hrcka • 10 months ago

ff110ad

fedora.conf

file modified

-31

		`@@ -16,18 +16,6 @@`
		`'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 @@`
		`gather_method = {`
		`'^.*': { # For all variants`
		`'comps': 'deps', # resolve dependencies for packages from comps file`
		`- 'module': 'nodeps', # but not for packages from modules`
		`}`
		`}`
lsedlar commented 9 months ago This could now be simplified to `gather_method = "deps"`.
		`gather_backend = 'dnf'`
		`@@ -89,9 +76,6 @@`
		`# BUILDINSTALL`
		`buildinstall_method = 'lorax'`
		`buildinstall_skip = [`
		`- ('^Modular$', {`
		`- '*': True`
		`- }),`
		`('^Everything$', {`
		`'i386': True`
		`}),`
		`@@ -176,15 +160,6 @@`
		`}),`
		`]`

		`- filter_modules = [`
		`- ('(Modular)$', {`
		`- '*': [`
		`- 'perlbootstrap:',`
		`- 'rpm:*',`
		`- ]`
		`- }),`
		`- ]`
		`-`
		`createiso_skip = [`
		`('^Server$', {`
		`'src': True`
		`@@ -194,12 +169,6 @@`
		`'*': True,`
		`'src': True`
		`}),`
		`-`
		`- ('^Modular$', {`
		`- '*': True,`
		`- 'src': True`
		`- }),`
		`-`
		`]`

		`# format: [(variant_uid_regex, {arch\|*: [scm_dicts]})]`

nightly.sh

file modified

+3 -5

		`@@ -121,13 +121,12 @@`
		`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 @@`
		`--variant Everything \`
		`--variant Cloud \`
		`--variant Container \`
		`- --variant Modular \`
		`--variant Server \`
		`--variant Spins \`
		`--variant Silverblue \`
		`@@ -184,12 +182,12 @@`
		`$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"`

variants-fedora.xml

file modified

-12

		`@@ -105,16 +105,4 @@`
		`<arch>x86_64</arch>`
		`</arches>`
		`</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>`

humaton commented 10 months ago

Signed-off-by: Tomas Hrcka thrcka@redhat.com

rebased onto ff110ad

10 months ago

Pull-Request has been merged by humaton

9 months ago

adamwill commented 9 months ago

Why? https://fedoraproject.org/wiki/Changes/No_default_fedora-repos-modular is the only relevant Change I can see, but that does not say the modular repos will be removed from composes, only that the repo definitions on installed systems will be disabled by default. The Change explicitly says that "[Users] can install fedora-repos-modular to activate the modular repos on their system", implying that the repos will continue to exist.

humaton commented 9 months ago

@adamwill because of https://pagure.io/fesco/issue/3027

lsedlar commented on line 26 of fedora.conf 9 months ago

This could now be simplified to gather_method = "deps".

adamwill commented 9 months ago

yeah, I found that subsequently, thanks.