davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial aarch64 compose enablement on primary koji

Browse Source 
This is the initial enablement for aarch64 on rawhide. It adds:
* repos/net install for Everything/Cloud/Server/Workstation
* Server DVD installs

It also cleans up the config a little, remove s390(x) multilib, orders
architectures alphabetically so they're consistent and a litte easier to
read thoughout variants-fedora.xml.

What is still outstanding:
* Add configs for slicing up the compose output and sync out to mirror locations
* Cloud and Docker images
* Disk images

The first item will be a new PR, the later two are being worked upon.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
Peter Robinson 2016-09-14 00:21:55 +01:00
parent 3f78de205a
commit b08802d7ca
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fedora.conf
View File

@ -19,18 +19,16 @@ sigkeys = ['81B46521', '030D5AED', None] # None = unsigned
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
tree_arches = ['i386', 'x86_64', 'armhfp']
tree_arches = ['i386', 'x86_64', 'armhfp', 'aarch64']
# limit tree variants
# if undefined, all variants from variants.xml will be included
#tree_variants = ['Server']
hashed_directories = True
# RUNROOT settings
runroot = True
#runroot_channel = 'fedora_compose'
runroot_channel = 'compose'
runroot_tag = 'f26-build'
@ -143,7 +141,6 @@ additional_packages = [
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
's390x': ['devel', 'runtime']
})
]
@ -269,7 +266,6 @@ translate_paths = [
('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),
]
# These will be inherited by live_media, live_images and image_build
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
global_release = None

27
variants-fedora.xml
View File

@ -8,11 +8,11 @@
</variant>
<variant id="CloudImages" name="CloudImages" type="variant" is_empty="true">
<arches>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>aarch64</arch>
<arch>i386</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>x86_64</arch>
</arches>
</variant>
<variant id="Docker" name="Docker" type="variant" is_empty="true">
@ -26,14 +26,13 @@
</variant>
<variant id="Everything" name="Everything" type="variant">
<arches>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>armhfp</arch>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>s390</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
</arches>
</variant>
<variant id="Labs" name="Labs" type="variant" is_empty="true">
@ -49,14 +48,13 @@
</variant>
<variant id="Server" name="Server" type="variant">
<arches>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>armhfp</arch>
<arch>aarch64</arch>
<arch>i386</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>s390</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">guest-agents</group>
@ -93,16 +91,17 @@
</variant>
<variant id="Spins" name="Spins" type="variant" is_empty="true">
<arches>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>armhfp</arch>
</arches>
</variant>
<variant id="Workstation" name="Workstation" type="variant">
<arches>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>armhfp</arch>
</arches>
<groups>
<group default="true">base-x</group>
@ -131,12 +130,12 @@
</variant>
<variant name="Cloud" id="Cloud" type="variant">
<arches>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>armhfp</arch>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>ppc64</arch>
<arch>ppc64le</arch>
<arch>x86_64</arch>
</arches>
<groups>
<group default="true">cloud-server</group>