From d31e674fbcab800e86f06361a5613cf5164b03fa Mon Sep 17 00:00:00 2001 From: Carl George Date: Jun 02 2020 14:53:08 +0000 Subject: Replace tabs with spaces for consistency --- diff --git a/c8-armhfp.conf b/c8-armhfp.conf index e4a1e93..7f96665 100644 --- a/c8-armhfp.conf +++ b/c8-armhfp.conf @@ -55,8 +55,8 @@ gather_prepopulate = "centos-armhfp-packages.json" gather_method = { "^(?!(AppStream|PowerTools|CR)).*$": { - "comps": "deps" - }, + "comps": "deps" + }, "^(AppStream|PowerTools|CR)$": "hybrid", } @@ -137,7 +137,7 @@ variant_as_lookaside = [ productimg = False translate_paths = [ - ("/mnt/koji", "https://koji.armhfp-mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.armhfp-mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/c8-stream-devel.conf b/c8-stream-devel.conf index 54d0ebc..ccd26d9 100644 --- a/c8-stream-devel.conf +++ b/c8-stream-devel.conf @@ -195,7 +195,7 @@ gather_lookaside_repos = [ productimg = False translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - # ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + # ("/compose", "http://172.22.0.123/compose"), ] diff --git a/c8-stream.conf b/c8-stream.conf index adde627..5eda096 100644 --- a/c8-stream.conf +++ b/c8-stream.conf @@ -161,7 +161,7 @@ extra_files = [ productimg = False translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/c8.conf b/c8.conf index 6222865..7966c16 100644 --- a/c8.conf +++ b/c8.conf @@ -167,7 +167,7 @@ extra_files = [ productimg = False translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/container.conf b/container.conf index 7ded8e1..aaafc22 100644 --- a/container.conf +++ b/container.conf @@ -80,9 +80,9 @@ image_build = { "disk-size": "10", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os', - ], - "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os', + 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os', + ], + "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/os', "failable": ["ppc64le","aarch64"], }, "factory-parameters": { @@ -95,6 +95,6 @@ image_build = { } translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/extras.conf b/extras.conf index 89066c8..70303af 100644 --- a/extras.conf +++ b/extras.conf @@ -24,15 +24,14 @@ koji_profile = "mbox" check_deps = False additional_packages = [ - ('^extras$', { - '*': [ - '*', - ], - }), + ('^extras$', { + '*': [ + '*', + ], + }), ] createiso_skip = [ - ('^extras$', { '*': True, 'src': True diff --git a/images-cloud.conf b/images-cloud.conf index dfea1c2..0a2098e 100644 --- a/images-cloud.conf +++ b/images-cloud.conf @@ -4,7 +4,7 @@ image_build = { "image-build": { "format": [("docker", "tar.gz")], "name": "CentOS-8-Container", - "subvariant": "container", + "subvariant": "container", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -16,10 +16,10 @@ image_build = { "arches": ["x86_64","ppc64le","aarch64"], "failable": ["ppc64le"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -31,7 +31,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-8-GenericCloud", - "subvariant": "generic", + "subvariant": "generic", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -42,10 +42,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -55,7 +55,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-8-ec2", - "subvariant": "ec2", + "subvariant": "ec2", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -66,10 +66,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64", "aarch64"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -79,7 +79,7 @@ image_build = { "image-build": { "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], "name": "CentOS-8-Vagrant", - "subvariant": "vagrant", + "subvariant": "vagrant", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -90,10 +90,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", "failable": ["ppc64le","aarch64"], }, "factory-parameters": { @@ -104,6 +104,6 @@ image_build = { } translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/images.conf b/images.conf index dfea1c2..0a2098e 100644 --- a/images.conf +++ b/images.conf @@ -4,7 +4,7 @@ image_build = { "image-build": { "format": [("docker", "tar.gz")], "name": "CentOS-8-Container", - "subvariant": "container", + "subvariant": "container", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -16,10 +16,10 @@ image_build = { "arches": ["x86_64","ppc64le","aarch64"], "failable": ["ppc64le"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -31,7 +31,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-8-GenericCloud", - "subvariant": "generic", + "subvariant": "generic", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -42,10 +42,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -55,7 +55,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-8-ec2", - "subvariant": "ec2", + "subvariant": "ec2", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -66,10 +66,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64", "aarch64"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -79,7 +79,7 @@ image_build = { "image-build": { "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], "name": "CentOS-8-Vagrant", - "subvariant": "vagrant", + "subvariant": "vagrant", "version": "8.1.1911", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -90,10 +90,10 @@ image_build = { "disk-size": "8", "arches": ["x86_64"], "repo": [ - "http://qa.centos.org/centos/8/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8/BaseOS/$arch/os/", "failable": ["ppc64le","aarch64"], }, "factory-parameters": { @@ -104,6 +104,6 @@ image_build = { } translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/include-excludes.conf b/include-excludes.conf index 8084b7d..53289af 100644 --- a/include-excludes.conf +++ b/include-excludes.conf @@ -500,7 +500,7 @@ additional_packages = [ ("^AppStream$", { "*": [ "langpacks-*", - "dotnet-*", + "dotnet-*", "ansible-freeipa", "fapolicyd", "python3-rpmfluff", @@ -555,28 +555,28 @@ additional_packages = [ "libreoffice-langpack-*", "libreoffice-help-*", ], - "armhfp": [ + "armhfp": [ "libreoffice-*", "libreoffice-help-*", "libreoffice-langpack-*", - "emacs-*", - "autocorr*", + "emacs-*", + "autocorr*", "fence-agents*", "gnome-shell-extension*", "google-noto*", "hunspell-*", "hyphen-*", - ] + ] }), ("^BaseOS$", { "*": [ "kernel-doc", - "centos-obsolete-packages", + "centos-obsolete-packages", ], - "armhfp": [ - "kernel-lpae*", - "uboot-tools", + "armhfp": [ + "kernel-lpae*", + "uboot-tools", "uboot-images*", "grub2*", "grubby-deprecated", @@ -584,6 +584,6 @@ additional_packages = [ "cloud-utils-growpart", "bcm283x-firmware", "efivar*", - ] + ] }), ] diff --git a/multilib.conf b/multilib.conf index 54df92e..173bdc4 100644 --- a/multilib.conf +++ b/multilib.conf @@ -12,6 +12,6 @@ multilib_whitelist = { "*": [ "valgrind", "papi", - "ggc-toolset-9-valgrind", + "ggc-toolset-9-valgrind", ], } diff --git a/plus.conf b/plus.conf index 9cec3c6..9b78d39 100644 --- a/plus.conf +++ b/plus.conf @@ -24,15 +24,14 @@ koji_profile = "mbox" check_deps = False additional_packages = [ - ('^plus$', { - '*': [ - '*', - ], - }), + ('^plus$', { + '*': [ + '*', + ], + }), ] createiso_skip = [ - ('^plus$', { '*': True, 'src': True diff --git a/stream-images-cloud.conf b/stream-images-cloud.conf index 10f1aa8..7b74141 100644 --- a/stream-images-cloud.conf +++ b/stream-images-cloud.conf @@ -4,7 +4,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-Stream-GenericCloud", - "subvariant": "stream-generic", + "subvariant": "stream-generic", "version": "8", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -15,10 +15,10 @@ image_build = { "disk-size": "10", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -28,7 +28,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-Stream-ec2", - "subvariant": "stream-ec2", + "subvariant": "stream-ec2", "version": "8", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -39,10 +39,10 @@ image_build = { "disk-size": "10", "arches": ["x86_64", "ppc64le", "aarch64"], "repo": [ - "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", }, "factory-parameters": { "generate_icicle": False, @@ -52,7 +52,7 @@ image_build = { "image-build": { "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], "name": "CentOS-Stream-Vagrant", - "subvariant": "stream-vagrant", + "subvariant": "stream-vagrant", "version": "8", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -63,10 +63,10 @@ image_build = { "disk-size": "10", "arches": ["x86_64"], "repo": [ - "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", - "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", - ], - "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", + "http://qa.centos.org/centos/8-stream/AppStream/$arch/os/", + ], + "install_tree_from": "http://qa.centos.org/centos/8-stream/BaseOS/$arch/os/", "failable": ["ppc64le","aarch64"], }, "factory-parameters": { @@ -77,6 +77,6 @@ image_build = { } translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/stream-images.conf b/stream-images.conf index 91f45b1..f3c348a 100644 --- a/stream-images.conf +++ b/stream-images.conf @@ -4,7 +4,7 @@ image_build = { "image-build": { "format": [("docker", "tar.gz")], "name": "CentOS-Stream-Container", - "subvariant": "stream-container", + "subvariant": "stream-container", "version": "8", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -16,8 +16,8 @@ image_build = { "arches": ["x86_64","ppc64le","aarch64"], "failable": ["ppc64le"], "repo": [ - 'BaseOS', - ], + 'BaseOS', + ], }, "factory-parameters": { "generate_icicle": False, @@ -29,7 +29,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-Stream-GenericCloud", - "subvariant": "stream-generic", + "subvariant": "stream-generic", "version": "8", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -40,8 +40,8 @@ image_build = { "disk-size": "10", "arches": ["x86_64","ppc64le","aarch64"], "repo": [ - 'BaseOS', - 'AppStream'], + 'BaseOS', + 'AppStream'], }, "factory-parameters": { "generate_icicle": False, @@ -51,7 +51,7 @@ image_build = { "image-build": { "format": [("qcow2", "qcow2")], "name": "CentOS-Stream-ec2", - "subvariant": "stream-ec2", + "subvariant": "stream-ec2", "version": "8", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -62,8 +62,8 @@ image_build = { "disk-size": "10", "arches": ["x86_64", "ppc64le", "aarch64"], "repo": [ - 'BaseOS', - 'AppStream'], + 'BaseOS', + 'AppStream'], }, "factory-parameters": { "generate_icicle": False, @@ -73,7 +73,7 @@ image_build = { "image-build": { "format": [("vagrant-libvirt", "vagrant-libvirt.box"),('vagrant-virtualbox','vagrant-virtualbox.box')], "name": "CentOS-Stream-Vagrant", - "subvariant": "stream-vagrant", + "subvariant": "stream-vagrant", "version": "8", "release": "!RELEASE_FROM_DATE_RESPIN" "target": "image-centos-8", @@ -84,8 +84,8 @@ image_build = { "disk-size": "10", "arches": ["x86_64"], "repo": [ - 'BaseOS', - 'AppStream'], + 'BaseOS', + 'AppStream'], "failable": ["ppc64le","aarch64"], }, "factory-parameters": { @@ -96,6 +96,6 @@ image_build = { } translate_paths = [ - ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), - ("/compose", "http://172.22.0.123/compose"), + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), ] diff --git a/stream-include-excludes.conf b/stream-include-excludes.conf index e39934b..f8c30be 100644 --- a/stream-include-excludes.conf +++ b/stream-include-excludes.conf @@ -504,7 +504,7 @@ additional_packages = [ "spice-qxl-xddm", "langpacks-*", "appstream-data", - "dotnet-*", + "dotnet-*", "ansible-freeipa", "fapolicyd", "python3-rpmfluff", @@ -590,18 +590,18 @@ additional_packages = [ "libreoffice-langpack-*", "libreoffice-help-*", ], - "armhfp": [ + "armhfp": [ "libreoffice-*", "libreoffice-help-*", "libreoffice-langpack-*", - "emacs-*", - "autocorr*", + "emacs-*", + "autocorr*", "fence-agents*", "gnome-shell-extension*", "google-noto*", "hunspell-*", "hyphen-*", - ] + ] "aarch64": [ "vulkan-loader", "vulkan-loader-devel", #RhBug 1767950 @@ -620,14 +620,14 @@ additional_packages = [ "elfutils-debuginfod-client", "elfutils-debuginfod-client-devel", "libbpf", - "python3-debuginfo", - "centos-obsolete-packages", - "libxmlb", - "python3-solv", + "python3-debuginfo", + "centos-obsolete-packages", + "libxmlb", + "python3-solv", ], - "armhfp": [ - "kernel-lpae*", - "uboot-tools", + "armhfp": [ + "kernel-lpae*", + "uboot-tools", "uboot-images*", "grub2*", "grubby-deprecated", @@ -635,6 +635,6 @@ additional_packages = [ "cloud-utils-growpart", "bcm283x-firmware", "efivar*", - ] + ] }), ]