From 16e293beda7ddcbd3cc8cc3bf858b7e662780b6a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mar 12 2016 02:17:28 +0000 Subject: convert all " to ' for consistency Signed-off-by: Dennis Gilmore --- diff --git a/fedora.conf b/fedora.conf index 843e18d..c706e5f 100644 --- a/fedora.conf +++ b/fedora.conf @@ -1,21 +1,21 @@ # PRODUCT INFO -release_name = "Fedora" -release_short = "Fedora" -release_version = "24" +release_name = 'Fedora' +release_short = 'Fedora' +release_version = '24' release_is_layered = False # GENERAL SETTINGS bootable = True -comps_file = "comps-f24.xml" #{ -# "scm": "git", -# "repo": "git://git.fedorahosted.org/git/comps.git", -# "branch": None, # defaults to cvs/HEAD or git/master -# "file": "comps-f23.xml", +comps_file = 'comps-f24.xml' #{ +# 'scm': 'git', +# 'repo': 'git://git.fedorahosted.org/git/comps.git', +# 'branch': None, # defaults to cvs/HEAD or git/master +# 'file': 'comps-f23.xml', #} -keep_original_comps = ["Everything"] +keep_original_comps = ['Everything'] -variants_file="variants-fedora.xml" -sigkeys = ["81B46521", "030D5AED"] # None = unsigned +variants_file='variants-fedora.xml' +sigkeys = ['81B46521', '030D5AED'] # None = unsigned # limit tree architectures # if undefined, all architectures from variants.xml will be included @@ -23,79 +23,79 @@ tree_arches = ['i386', 'x86_64', 'armhfp'] # limit tree variants # if undefined, all variants from variants.xml will be included -#tree_variants = ["Server"] +#tree_variants = ['Server'] hashed_directories = True # RUNROOT settings runroot = True -#runroot_channel = "fedora_compose" -runroot_channel = "compose" -runroot_tag = "f24-build" +#runroot_channel = 'fedora_compose' +runroot_channel = 'compose' +runroot_tag = 'f24-build' # PKGSET -pkgset_source = "koji" # koji, repos +pkgset_source = 'koji' # koji, repos # PKGSET - REPOS # pkgset_repos format: {arch: [repo1_url, repo2_url, ...]} # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_path_prefix = "/mnt/koji/" -pkgset_koji_url = "http://koji.fedoraproject.org/kojihub" -pkgset_koji_tag = "f24" +pkgset_koji_path_prefix = '/mnt/koji/' +pkgset_koji_url = 'http://koji.fedoraproject.org/kojihub' +pkgset_koji_tag = 'f24' pkgset_koji_inherit = False filter_system_release_packages = False # GATHER -gather_source = "comps" -gather_method = "deps" +gather_source = 'comps' +gather_method = 'deps' check_deps = False -greedy_method = "build" +greedy_method = 'build' # fomat: [(variant_uid_regex, {arch|*: [repos]})] # gather_lookaside_repos = [] # GATHER - JSON # format: {variant_uid: {arch: package: [arch1, arch2, None (for any arch)]}} -#gather_source_mapping = "/path/to/mapping.json" +#gather_source_mapping = '/path/to/mapping.json' -link_files = "hardlink-or-copy" +link_files = 'hardlink-or-copy' -notification_script = "/usr/bin/pungi-fedmsg-notification" +notification_script = '/usr/bin/pungi-fedmsg-notification' # CREATEREPO createrepo_c = True -createrepo_checksum = "sha256" +createrepo_checksum = 'sha256' # CHECKSUMS -media_checksums = ["sha256"] +media_checksums = ['sha256'] media_checksum_one_file = True -media_checksum_base_filename = "%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s" +media_checksum_base_filename = '%(release_short)s-%(variant)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s' #jigdo create_jigdo = False # BUILDINSTALL -buildinstall_method = "lorax" +buildinstall_method = 'lorax' # Enables macboot on x86_64 for all variants and disables upgrade image building # # everywhere. lorax_options = [ - ("^.*$", { - "x86_64": { - "nomacboot": False + ('^.*$', { + 'x86_64': { + 'nomacboot': False } - "*": { - "noupgrade": True + '*': { + 'noupgrade': True } }) ] #extra_packages = [ -# "/mnt/packages/foo*", +# '/mnt/packages/foo*', #] @@ -173,7 +173,7 @@ filter_packages = [ # format: {arch|*: [packages]} multilib_blacklist = { - "*": ['kernel*', 'kernel-PAE*', 'kernel*debug*', + '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*', 'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel', 'php-devel', 'java-1.6.0-openjdk-devel', @@ -186,7 +186,7 @@ multilib_blacklist = { # format: {arch|*: [packages]} multilib_whitelist = { - "*": ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper', + '*': ['libgnat', 'wine*', 'lmms-vst', 'nspluginwrapper', 'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb', 'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux', 'syslinux-tftpboot', 'nosync', @@ -220,27 +220,27 @@ createiso_skip = [ # ('^(Server|Workstation|Cloud)$', { # '*': [ # { -# "scm": "rpm", -# "repo": "fedora-release-%(variant_id_lower)s", -# "branch": None, -# "file": [ -# "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release", +# 'scm': 'rpm', +# 'repo': 'fedora-release-%(variant_id_lower)s', +# 'branch': None, +# 'file': [ +# '/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-release', # ], -# "target": "", +# 'target': '', # }, # ], # }), #] # Image name respecting Fedora's image naming policy -image_name_format = "%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso" +image_name_format = '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(date)s%(type_suffix)s.%(respin)s.iso' # # Use the same format for volume id image_volid_formats = [ - "%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s" + '%(release_short)s-%(variant)s-%(disc_type)s-%(arch)s-%(version)s' ] # No special handling for layered products, use same format as for regular images image_volid_layered_product_formats = [] -# Replace "Cloud" with "C" in volume id etc. +# Replace 'Cloud' with 'C' in volume id etc. volume_id_substitutions = { 'Rawhide': 'rawh', 'Images': 'img', @@ -269,7 +269,7 @@ disc_types = { } translate_paths = [ - ("/mnt/koji/compose/", "http://kojipkgs.fedoraproject.org/compose/"), + ('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'), ] @@ -283,8 +283,8 @@ image_build = { 'version': '24', 'release': None, # correct SHA1 hash will be put into the URL below automatically - 'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", - 'kickstart': "fedora-docker-base.ks", + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', + 'kickstart': 'fedora-docker-base.ks', 'distro': 'Fedora-20', 'disk_size': 3, 'arches': ['x86_64'], @@ -302,8 +302,8 @@ image_build = { 'target': 'f24', 'version': '24', 'release': None, - 'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", - 'kickstart': "fedora-cloud-base.ks", + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', + 'kickstart': 'fedora-cloud-base.ks', 'distro': 'Fedora-20', 'disk_size': 3, 'arches': ['x86_64', 'i386'], @@ -319,8 +319,8 @@ image_build = { 'target': 'f24', 'version': '24', 'release': None, - 'ksurl': "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", - 'kickstart': "fedora-cloud-base-vagrant.ks", + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', + 'kickstart': 'fedora-cloud-base-vagrant.ks', 'distro': 'Fedora-20', 'disk_size': 40, 'arches': ['x86_64', 'i386'], @@ -341,7 +341,7 @@ live_media = { '^Workstation$': [ { 'name': 'Fedora-Workstation-Live', - 'kickstart': "fedora-live-workstation.ks", + 'kickstart': 'fedora-live-workstation.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'subvariant': 'Workstation' @@ -351,7 +351,7 @@ live_media = { '^Spins': [ { 'name': 'Fedora-KDE-Live', - 'kickstart': "fedora-live-kde.ks", + 'kickstart': 'fedora-live-kde.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -360,7 +360,7 @@ live_media = { }, { 'name': 'Fedora-Xfce-Live', - 'kickstart': "fedora-live-xfce.ks", + 'kickstart': 'fedora-live-xfce.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -368,7 +368,7 @@ live_media = { }, { 'name': 'Fedora-SoaS-Live', - 'kickstart': "fedora-live-soas.ks", + 'kickstart': 'fedora-live-soas.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -376,7 +376,7 @@ live_media = { }, { 'name': 'Fedora-Cinnamon-Live', - 'kickstart': "fedora-live-cinnamon.ks", + 'kickstart': 'fedora-live-cinnamon.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -384,7 +384,7 @@ live_media = { }, { 'name': 'Fedora-LXDE-Live', - 'kickstart': "fedora-live-lxde.ks", + 'kickstart': 'fedora-live-lxde.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -392,7 +392,7 @@ live_media = { }, { 'name': 'Fedora-MATE_Compiz-Live', - 'kickstart': "fedora-live-mate_compiz.ks", + 'kickstart': 'fedora-live-mate_compiz.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -402,7 +402,7 @@ live_media = { '^Labs$': [ { 'name': 'Fedora-Astronomy_KDE-Live', - 'kickstart': "fedora-live-astronomy_kde.ks", + 'kickstart': 'fedora-live-astronomy_kde.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -410,7 +410,7 @@ live_media = { }, { 'name': 'Fedora-Design_suite-Live', - 'kickstart': "fedora-live-design_suite.ks", + 'kickstart': 'fedora-live-design_suite.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -418,7 +418,7 @@ live_media = { }, { 'name': 'Fedora-Scientific_KDE-Live', - 'kickstart': "fedora-live-scientific_kde.ks", + 'kickstart': 'fedora-live-scientific_kde.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -426,7 +426,7 @@ live_media = { }, { 'name': 'Fedora-Games-Live', - 'kickstart': "fedora-live-games.ks", + 'kickstart': 'fedora-live-games.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -434,7 +434,7 @@ live_media = { }, { 'name': 'Fedora-Security-Live', - 'kickstart': "fedora-live-security.ks", + 'kickstart': 'fedora-live-security.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -442,7 +442,7 @@ live_media = { }, { 'name': 'Fedora-Jam_KDE-Live', - 'kickstart': "fedora-live-jam_kde.ks", + 'kickstart': 'fedora-live-jam_kde.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -450,7 +450,7 @@ live_media = { }, { 'name': 'Fedora-Robotics-Live', - 'kickstart': "fedora-live-robotics.ks", + 'kickstart': 'fedora-live-robotics.ks', 'arches': ['x86_64', 'i386'], 'repo_from': 'Everything', 'install_tree_from': 'Everything', @@ -474,88 +474,88 @@ live_images_no_rename = True # fomat: [(variant_uid_regex, {arch|*: scm_dict})] live_images = [ ('^Workstation$', { - "armhfp": { - 'kickstart': "fedora-arm-workstation.ks", - "name": "Fedora-Workstation-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'armhfp': { + 'kickstart': 'fedora-arm-workstation.ks', + 'name': 'Fedora-Workstation-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, - "type": "appliance" + 'type': 'appliance' } }), ('^Server$', { - "armhfp": { - 'kickstart': "fedora-arm-server.ks", - "name": "Fedora-Server-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'armhfp': { + 'kickstart': 'fedora-arm-server.ks', + 'name': 'Fedora-Server-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, - "type": "appliance" + 'type': 'appliance' } }), ('^Spins$', { - "armhfp": [{ - 'kickstart': "fedora-arm-kde.ks", - "name": "Fedora-KDE-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'armhfp': [{ + 'kickstart': 'fedora-arm-kde.ks', + 'name': 'Fedora-KDE-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, 'repo_from': 'Everything', - "type": "appliance", + 'type': 'appliance', 'subvariant': 'KDE' }, { - 'kickstart': "fedora-arm-lxde.ks", - "name": "Fedora-LXDE-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'kickstart': 'fedora-arm-lxde.ks', + 'name': 'Fedora-LXDE-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, 'repo_from': 'Everything', - "type": "appliance", + 'type': 'appliance', 'subvariant': 'LXDE' }, { - 'kickstart': "fedora-arm-mate.ks", - "name": "Fedora-Mate-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'kickstart': 'fedora-arm-mate.ks', + 'name': 'Fedora-Mate-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, 'repo_from': 'Everything'. - "type": "appliance", + 'type': 'appliance', 'subvariant': 'Mate' }, { - 'kickstart': "fedora-arm-minimal.ks", - "name": "Fedora-Minimal-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'kickstart': 'fedora-arm-minimal.ks', + 'name': 'Fedora-Minimal-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, 'repo_from': 'Everything', - "type": "appliance", + 'type': 'appliance', 'subvariant': 'Minimal' }, { - 'kickstart': "fedora-arm-soas.ks", - "name": "Fedora-SoaS-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'kickstart': 'fedora-arm-soas.ks', + 'name': 'Fedora-SoaS-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, 'repo_from': 'Everything', - "type": "appliance", + 'type': 'appliance', 'subvariant': 'SoaS' }, { - 'kickstart': "fedora-arm-xfce.ks", - "name": "Fedora-Xfce-armhfp", - "version": "24", - "ksurl": "git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD", + 'kickstart': 'fedora-arm-xfce.ks', + 'name': 'Fedora-Xfce-armhfp', + 'version': '24', + 'ksurl': 'git://git.fedorahosted.org/git/spin-kickstarts.git?#HEAD', 'release': None, 'repo_from': 'Everything', - 'type': "appliance", + 'type': 'appliance', 'subvariant': 'Xfce' },] }), ] release_id_allow_missing = True -koji_profile = "koji" +koji_profile = 'koji'