Compare commits

...

1 Commits

Author SHA1 Message Date
88254e33aa
Initial adjustments for riscv64
Not tested.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-08-29 17:32:32 +03:00
5 changed files with 32 additions and 26 deletions

View File

@ -148,10 +148,10 @@ image_build = {
'kickstart': 'fedora-cloud-base.ks', 'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 4, 'disk_size': 4,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
], ],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/', 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base' 'subvariant': 'Cloud_Base'

View File

@ -149,11 +149,11 @@ image_build = {
'kickstart': 'fedora-container-base.ks', 'kickstart': 'fedora-container-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/', 'install_tree_from': 'http://fedora.riscv.rocks/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
], ],
'subvariant': 'Container_Base' 'subvariant': 'Container_Base'
}, },
@ -171,11 +171,11 @@ image_build = {
'kickstart': 'fedora-container-base-minimal.ks', 'kickstart': 'fedora-container-base-minimal.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/', 'install_tree_from': 'http://fedora.riscv.rocks/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
], ],
'subvariant': 'Container_Minimal_Base', 'subvariant': 'Container_Minimal_Base',
}, },
@ -193,11 +193,11 @@ image_build = {
'kickstart': 'fedora-container-toolbox.ks', 'kickstart': 'fedora-container-toolbox.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/', 'install_tree_from': 'http://fedora.riscv.rocks/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/' 'http://fedora.riscv.rocks/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
], ],
'subvariant': 'Container_Toolbox', 'subvariant': 'Container_Toolbox',
}, },

View File

@ -212,7 +212,7 @@ image_build = {
'kickstart': 'fedora-container-base.ks', 'kickstart': 'fedora-container-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Container_Base', 'subvariant': 'Container_Base',
@ -232,7 +232,7 @@ image_build = {
'kickstart': 'fedora-container-base-minimal.ks', 'kickstart': 'fedora-container-base-minimal.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Container_Minimal_Base', 'subvariant': 'Container_Minimal_Base',
@ -252,7 +252,7 @@ image_build = {
'kickstart': 'fedora-container-toolbox.ks', 'kickstart': 'fedora-container-toolbox.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Container_Toolbox', 'subvariant': 'Container_Toolbox',
@ -274,7 +274,7 @@ image_build = {
'kickstart': 'fedora-cloud-base.ks', 'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Cloud_Base', 'subvariant': 'Cloud_Base',
@ -390,7 +390,7 @@ image_build = {
'kickstart': 'fedora-disk-minimal.ks', 'kickstart': 'fedora-disk-minimal.ks',
'distro': 'Fedora-30', 'distro': 'Fedora-30',
'disk_size': 6, 'disk_size': 6,
'arches': ['aarch64'], 'arches': ['aarch64', 'riscv64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Minimal', 'subvariant': 'Minimal',
@ -475,7 +475,7 @@ image_build = {
'kickstart': 'fedora-disk-workstation.ks', 'kickstart': 'fedora-disk-workstation.ks',
'distro': 'Fedora-30', 'distro': 'Fedora-30',
'disk_size': 16, 'disk_size': 16,
'arches': ['aarch64'], 'arches': ['aarch64', 'riscv64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Workstation', 'subvariant': 'Workstation',
@ -491,7 +491,7 @@ image_build = {
'kickstart': 'fedora-disk-server.ks', 'kickstart': 'fedora-disk-server.ks',
'distro': 'Fedora-30', 'distro': 'Fedora-30',
'disk_size': 7, 'disk_size': 7,
'arches': ['aarch64'], 'arches': ['aarch64', 'riscv64'],
'repo': 'Server', 'repo': 'Server',
'install_tree_from': 'Server', 'install_tree_from': 'Server',
'subvariant': 'Server', 'subvariant': 'Server',
@ -505,7 +505,7 @@ image_build = {
'kickstart': 'fedora-server-vm-full.ks', 'kickstart': 'fedora-server-vm-full.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 7, 'disk_size': 7,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64', 'riscv64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Server_KVM', 'subvariant': 'Server_KVM',
@ -520,7 +520,7 @@ live_media = {
{ {
'name': 'Fedora-Workstation-Live', 'name': 'Fedora-Workstation-Live',
'kickstart': 'fedora-live-workstation.ks', 'kickstart': 'fedora-live-workstation.ks',
'arches': ['x86_64', 'ppc64le', 'aarch64'], 'arches': ['x86_64', 'ppc64le', 'aarch64', 'riscv64'],
'failable': ['ppc64le', 'aarch64'], 'failable': ['ppc64le', 'aarch64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',

View File

@ -3,7 +3,7 @@ variants_file='variants-fedora.xml'
# limit tree architectures # limit tree architectures
# if undefined, all architectures from variants.xml will be included # if undefined, all architectures from variants.xml will be included
tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64'] tree_arches = ['riscv64']
hashed_directories = True hashed_directories = True
@ -79,5 +79,5 @@ disc_types = {
} }
translate_paths = [ translate_paths = [
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'), ('/mnt/koji/compose/', 'http://fedora.riscv.rocks/compose/'),
] ]

View File

@ -7,6 +7,7 @@
<arch>ppc64le</arch> <arch>ppc64le</arch>
<arch>s390x</arch> <arch>s390x</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
<arch>riscv64</arch>
</arches> </arches>
</variant> </variant>
<variant id="Container" name="Container" type="variant" is_empty="true"> <variant id="Container" name="Container" type="variant" is_empty="true">
@ -16,6 +17,7 @@
<arch>ppc64le</arch> <arch>ppc64le</arch>
<arch>s390x</arch> <arch>s390x</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
<arch>riscv64</arch>
</arches> </arches>
</variant> </variant>
<variant id="Everything" name="Everything" type="variant"> <variant id="Everything" name="Everything" type="variant">
@ -25,6 +27,7 @@
<arch>ppc64le</arch> <arch>ppc64le</arch>
<arch>s390x</arch> <arch>s390x</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
<arch>riscv64</arch>
</arches> </arches>
</variant> </variant>
<variant id="Labs" name="Labs" type="variant" is_empty="true"> <variant id="Labs" name="Labs" type="variant" is_empty="true">
@ -41,6 +44,7 @@
<arch>ppc64le</arch> <arch>ppc64le</arch>
<arch>s390x</arch> <arch>s390x</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
<arch>riscv64</arch>
</arches> </arches>
<groups> <groups>
<group default="true">guest-agents</group> <group default="true">guest-agents</group>
@ -77,6 +81,7 @@
<arch>armhfp</arch> <arch>armhfp</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
<arch>ppc64le</arch> <arch>ppc64le</arch>
<arch>riscv64</arch>
</arches> </arches>
</variant> </variant>
<variant id="Silverblue" name="Silverblue" type="variant" is_empty="true"> <variant id="Silverblue" name="Silverblue" type="variant" is_empty="true">
@ -84,6 +89,7 @@
<arch>aarch64</arch> <arch>aarch64</arch>
<arch>x86_64</arch> <arch>x86_64</arch>
<arch>ppc64le</arch> <arch>ppc64le</arch>
<arch>riscv64</arch>
</arches> </arches>
</variant> </variant>
<variant id="Kinoite" name="Kinoite" type="variant" is_empty="true"> <variant id="Kinoite" name="Kinoite" type="variant" is_empty="true">