Merge #10 Use global live_media settings

This commit is contained in:
Dennis Gilmore 2016-03-08 14:47:08 +00:00
commit ea7c6563db

View File

@ -321,91 +321,61 @@ image_build = {
],
}
# These will be inherited for all live media
live_media_ksurl = "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD"
live_media_release = None
live_media_version = "Rawhide"
live_media_target = "f25"
live_media = {
'^Workstation$': [
{
'name': 'Fedora-Workstation-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-workstation.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
}
],
'^Spins': [
{
'name': 'Fedora-KDE-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-kde.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Xfce-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-xfce.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-SoaS-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-soas.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Cinnamon-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-cinnamon.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-LXDE-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-lxde.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-MATE_Compiz-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-mate_compiz.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
}
@ -413,85 +383,50 @@ live_media = {
'^Labs$': [
{
'name': 'Fedora-Astronomy_KDE-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-astronomy_kde.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Design_suite-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-design_suite.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Scientific_KDE-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-scientific_kde.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Games-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-games.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Security-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-security.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Jam_KDE-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-jam_kde.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
},
{
'name': 'Fedora-Robotics-Live',
'target': 'f25',
'version': 'Rawhide',
# correct SHA1 hash will be put into the URL below automatically
"ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD",
'kickstart': "fedora-live-robotics.ks",
'arches': ['x86_64', 'i386'],
'release': None,
'repo_from': 'Everything'
'install_tree_from': 'Everything'
}