iot/pungi-iot
0
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

F-36: drop aarch64/x86_64 as they're now on F-37, keep armhfp until F-36 is EOL

Browse source 
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2022-11-21 10:36:52 +00:00
commit 2d18feb4e0
1 changed files with 1 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

78
fedora-iot.conf
View file

@ -215,7 +215,7 @@ image_build = {
'kickstart': 'fedora-iot.ks',
'distro': 'Fedora-30',
'disk_size': 4,
'arches': ['armhfp', 'aarch64', 'x86_64'],
'arches': ['armhfp'],
'install_tree_from': "https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/",
'subvariant': 'IoT',
}
@ -225,22 +225,6 @@ image_build = {
ostree = [
("^IoT$", {
"aarch64": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "f36",
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/stable/${basearch}/iot",
"update_summary": True,
},
"armhfp": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
@ -257,49 +241,11 @@ ostree = [
"ostree_ref": "fedora/stable/${basearch}/iot",
"update_summary": True,
},
"x86_64": {
"version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
"force_new_commit": True,
"treefile": "fedora-iot.json",
"config_url": "https://pagure.io/fedora-iot/ostree.git",
"config_branch": "f36",
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$basearch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$basearch/os/"
]
"tag_ref": False,
"ostree_repo": "/mnt/koji/compose/iot/repo/",
"ostree_ref": "fedora/stable/${basearch}/iot",
"update_summary": True,
}
})
]
ostree_installer = [
("^IoT$", {
"aarch64": {
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
"ostree-based-installer/lorax-embed-repo.tmpl"],
"add_template_var": [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org/iot/",
"ostree_osname=fedora-iot",
"ostree_oskey=fedora-36-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
"ostree_install_ref=fedora/stable/aarch64/iot",
"ostree_update_ref=fedora/stable/aarch64/iot",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'f36',
},
"armhfp": {
"repo": [
"IoT",
@ -322,28 +268,6 @@ ostree_installer = [
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'f36',
},
"x86_64": {
"repo": [
"IoT",
"https://kojipkgs.fedoraproject.org/compose/36/Fedora-36-20220504.1/compose/Everything/$arch/os/",
"https://kojipkgs.fedoraproject.org/compose/updates/f36-updates/compose/Everything/$arch/os/"
],
"release": None,
"rootfs_size": "4",
"add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",
"ostree-based-installer/lorax-embed-repo.tmpl"],
"add_template_var": [
"ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/iot/repo/",
"ostree_update_repo=https://ostree.fedoraproject.org/iot/",
"ostree_osname=fedora-iot",
"ostree_oskey=fedora-36-primary",
"ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist",
"ostree_install_ref=fedora/stable/x86_64/iot",
"ostree_update_ref=fedora/stable/x86_64/iot",
],
'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
'template_branch': 'f36',
}
})
]