From a66f572344cd8de7bcd28f40cbea133c269fe1d8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mar 09 2016 14:45:52 +0000 Subject: move to global options for the livemedia creation Signed-off-by: Dennis Gilmore --- diff --git a/fedora.conf b/fedora.conf index b3ac482..7430438 100644 --- a/fedora.conf +++ b/fedora.conf @@ -321,91 +321,60 @@ image_build = { ], } +live_media_version = '24' +live_media_release = None +live_media_ksurl = 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD' +live_media_target = 'f24' live_media = { '^Workstation$': [ { 'name': 'Fedora-Workstation-Live', - 'target': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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 +382,50 @@ live_media = { '^Labs$': [ { 'name': 'Fedora-Astronomy_KDE-Live', - 'target': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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': 'f24', - 'version': '24', - # 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' }