PR#1072: Retire ARMv7/armhfp from the compose - pungi-fedora

pungi-fedora

#1072 Retire ARMv7/armhfp from the compose

Merged 2 years ago by mohanboddu. Opened 2 years ago by pbrobinson.

pbrobinson/pungi-fedora retire-armhfp into main

Retire ARMv7/armhfp from the compose

Peter Robinson • 2 years ago

cac6ad0

fedora-container.conf

file modified

+3 -3

		`@@ -17,7 +17,7 @@`
		`sigkeys = ['5323552A'] # None = unsigned`
		`# limit tree architectures`
		`# if undefined, all architectures from variants.xml will be included`
		`- tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']`
		`+ tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']`
		`# limit tree variants`
		`# if undefined, all variants from variants.xml will be included`
		`tree_variants = ['Container']`
		`@@ -228,7 +228,7 @@`
		`'kickstart': 'fedora-container-base.ks',`
		`'distro': 'Fedora-22',`
		`'disk_size': 5,`
		`- 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',`
		`'repo': [`
		`'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'`
		`@@ -250,7 +250,7 @@`
		`'kickstart': 'fedora-container-base-minimal.ks',`
		`'distro': 'Fedora-22',`
		`'disk_size': 5,`
		`- 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',`
		`'repo': [`
		`'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'`

fedora.conf

file modified

+9 -9

		`@@ -29,7 +29,7 @@`

		`# limit tree architectures`
		`# if undefined, all architectures from variants.xml will be included`
		`- tree_arches = ['aarch64', 'armhfp', 'ppc64le', 's390x', 'x86_64']`
		`+ tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']`

		`# limit tree variants`
		`# if undefined, all variants from variants.xml will be included`
		`@@ -327,7 +327,7 @@`
		`'kickstart': 'fedora-container-base.ks',`
		`'distro': 'Fedora-22',`
		`'disk_size': 5,`
		`- 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'Container_Base',`
		`@@ -347,7 +347,7 @@`
		`'kickstart': 'fedora-container-base-minimal.ks',`
		`'distro': 'Fedora-22',`
		`'disk_size': 5,`
		`- 'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`+ 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'Container_Minimal_Base',`
		`@@ -468,7 +468,7 @@`
		`'kickstart': 'fedora-disk-minimal.ks',`
		`'distro': 'Fedora-30',`
		`'disk_size': 6,`
		`- 'arches': ['aarch64', 'armhfp'],`
		`+ 'arches': ['aarch64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'Minimal',`
		`@@ -482,7 +482,7 @@`
		`'kickstart': 'fedora-disk-kde.ks',`
		`'distro': 'Fedora-30',`
		`'disk_size': 14,`
		`- 'arches': ['aarch64', 'armhfp'],`
		`+ 'arches': ['aarch64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'KDE',`
		`@@ -496,7 +496,7 @@`
		`'kickstart': 'fedora-disk-soas.ks',`
		`'distro': 'Fedora-30',`
		`'disk_size': 10,`
		`- 'arches': ['aarch64', 'armhfp'],`
		`+ 'arches': ['aarch64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'SoaS',`
		`@@ -510,7 +510,7 @@`
		`'kickstart': 'fedora-disk-xfce.ks',`
		`'distro': 'Fedora-30',`
		`'disk_size': 11,`
		`- 'arches': ['aarch64', 'armhfp'],`
		`+ 'arches': ['aarch64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'Xfce',`
		`@@ -526,7 +526,7 @@`
		`'kickstart': 'fedora-disk-workstation.ks',`
		`'distro': 'Fedora-30',`
		`'disk_size': 13,`
		`- 'arches': ['armhfp', 'aarch64'],`
		`+ 'arches': ['aarch64'],`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'Workstation',`
		`@@ -542,7 +542,7 @@`
		`'kickstart': 'fedora-disk-server.ks',`
		`'distro': 'Fedora-30',`
		`'disk_size': 7,`
		`- 'arches': ['armhfp', 'aarch64'],`
		`+ 'arches': ['aarch64'],`
		`'repo': 'Server',`
		`'install_tree_from': 'Server',`
		`'subvariant': 'Server',`

nightly.sh

file modified

+5 -5

		`@@ -121,8 +121,8 @@`
		`if [ ! -d "$RSYNCTARGET" ]; then`
		`mkdir "$RSYNCTARGET"`
		`fi`
		`- # armhfp/aarch64/x86_64 for Everything Cloud Container Modular Server Workstation is primary`
		`- $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \`
		`+ # aarch64/x86_64 for Everything Cloud Container Modular Server Workstation is primary`
		`+ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`--variant Everything \`
		`--variant Cloud \`
		`@@ -134,7 +134,7 @@`
		`--variant Kinoite \`
		`--variant Workstation \`
		`--link-dest="$RSYNCTARGET/Everything" --exclude=repodata`
		`- $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \`
		`+ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \`
		`"$DESTDIR" "$RSYNCTARGET/" \`
		`--variant Everything \`
		`--variant Cloud \`
		`@@ -158,11 +158,11 @@`
		`mkdir "$RSYNCALTTARGET"`
		`fi`
		`# labs artefacts are alternative`
		`- $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 \`
		`+ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 \`
		`"$DESTDIR" "$RSYNCALTTARGET/" \`
		`--variant Labs \`
		`--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata`
		`- $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 \`
		`+ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 \`
		`"$DESTDIR" "$RSYNCALTTARGET/" \`
		`--variant Labs \`
		`--link-dest="$RSYNCTARGET/Everything/" --delete-after`