$ git show --format=fuller --patch-with-stat --summary 6c68d6fb9417cdc5e573326ea216e110380a95fb
commit 6c68d6fb9417cdc5e573326ea216e110380a95fb
Author: Alex <alexander@mezon.ru>
AuthorDate: Tue Oct 8 00:36:59 2019 +0000
Commit: Alex <alexander@mezon.ru>
CommitDate: Tue Oct 8 00:36:59 2019 +0000
fix configs
---
abf-console-client.spec | 2 +-
cooker-aarch64-main.cfg | 37 ++++++++++++++++++++++++-------------
cooker-armv7hnl-main.cfg | 37 ++++++++++++++++++++++++-------------
cooker-x86_64-main.cfg | 36 ++++++++++++++++++++++++------------
4 files changed, 73 insertions(+), 39 deletions(-)
diff --git a/abf-console-client.spec b/abf-console-client.spec
index 456f026..c8a5f15 100644
--- a/abf-console-client.spec
+++ b/abf-console-client.spec
@@ -1,6 +1,6 @@
Name: abf-console-client
Version: 3.0.2.2
-Release: 2
+Release: 3
Summary: Console client for ABF (https://abf.openmandriva.org)
Group: System/Configuration/Packaging
License: GPLv2
diff --git a/cooker-aarch64-main.cfg b/cooker-aarch64-main.cfg
index 3d2ceee..ecf55e4 100644
--- a/cooker-aarch64-main.cfg
+++ b/cooker-aarch64-main.cfg
@@ -1,22 +1,35 @@
config_opts['target_arch'] = 'aarch64'
-config_opts['legal_host_arches'] = ('i586', 'i686', 'x86_64', 'aarch64')
-config_opts['root'] = 'openmandriva-aarch64'
-config_opts['chroot_setup_cmd'] = ('install', 'basesystem-minimal', 'locales', 'locales-en', 'distro-release-OpenMandriva', 'gnupg', 'shadow', 'rpm-build', 'glibc-devel' ,'wget', 'task-devel', 'clang', 'openmandriva-repos-pkgprefs', 'rpmlint-distro-policy', 'dwz')
+config_opts['legal_host_arches'] = ('znver1', 'x86_64', 'aarch64')
+config_opts['root'] = 'cooker-aarch64'
+config_opts['chroot_setup_cmd'] = ('install', 'basesystem-minimal', 'locales', 'locales-en', 'distro-release-OpenMandriva', 'gnupg', 'shadow', 'rpm-build', 'glibc-devel' ,'wget', 'task-devel', 'openmandriva-repos-pkgprefs', 'rpmlint-distro-policy', 'dwz', 'dnf')
config_opts['package_manager'] = 'dnf'
config_opts['dnf_common_opts'] = ['--refresh', '--disableplugin=local', '--setopt=deltarpm=False', '--forcearch=aarch64']
config_opts['dnf_builddep_opts'] = ['--refresh', '--forcearch=aarch64']
config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
-config_opts['releasever'] = '0' # at some point, this should be set by ABF
+config_opts['releasever'] = '0'
config_opts['use_nspawn'] = False
-config_opts['tar'] = "bsdtar"
+config_opts['tar'] = 'bsdtar'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['cache_topdir'] = '/var/cache/mock/'
-
-config_opts['dist'] = 'cooker' # only useful for --resultdir variable subst
+config_opts['nosync'] = True
+config_opts['plugin_conf']['tmpfs_enable'] = True
+config_opts['plugin_conf']['tmpfs_opts'] = {}
+config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 16000
+config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '80%'
+config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
+config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
+config_opts['dist'] = 'cooker'
config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['root_cache_enable'] = 'False'
-config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "xz"
-config_opts['plugin_conf']['root_cache_opts']['extension'] = ".xz"
+config_opts['plugin_conf']['root_cache_opts']['compress_program'] = ''
+config_opts['plugin_conf']['root_cache_opts']['extension'] = ''
+config_opts['plugin_conf']['root_cache_enable'] = True
+config_opts['plugin_conf']['root_cache_opts']['age_check'] = True
+config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 1
+config_opts['plugin_conf']['package_state_enable'] = True
+config_opts['plugin_conf']['package_state_opts'] = {}
+config_opts['plugin_conf']['package_state_opts']['available_pkgs'] = False
+config_opts['plugin_conf']['package_state_opts']['installed_pkgs'] = True
+
config_opts['yum.conf'] = """
[main]
keepcache=1
@@ -29,7 +42,7 @@ assumeyes=1
syslog_ident=mock
syslog_device=
install_weak_deps=0
-metadata_expire=0
+metadata_expire=60s
best=1
[cooker_main_release]
@@ -37,6 +50,4 @@ name=cooker_main_release
baseurl=http://abf-downloads.openmandriva.org/cooker/repository/aarch64/main/release
gpgcheck=0
enabled=1
-
"""
-
diff --git a/cooker-armv7hnl-main.cfg b/cooker-armv7hnl-main.cfg
index c54530e..2f057c2 100644
--- a/cooker-armv7hnl-main.cfg
+++ b/cooker-armv7hnl-main.cfg
@@ -1,22 +1,35 @@
config_opts['target_arch'] = 'armv7hnl'
-config_opts['legal_host_arches'] = ('i586', 'i686', 'x86_64', 'armv7hnl', 'aarch64')
-config_opts['root'] = 'openmandriva-armv7hnl'
-config_opts['chroot_setup_cmd'] = ('install', 'basesystem-minimal', 'locales', 'locales-en', 'distro-release-OpenMandriva', 'gnupg', 'shadow', 'rpm-build', 'glibc-devel' ,'wget', 'task-devel', 'clang', 'openmandriva-repos-pkgprefs', 'rpmlint-distro-policy', 'dwz')
+config_opts['legal_host_arches'] = ('znver1', 'x86_64', 'aarch64', 'armv7hnl')
+config_opts['root'] = 'cooker-armv7hnl'
+config_opts['chroot_setup_cmd'] = ('install', 'basesystem-minimal', 'locales', 'locales-en', 'distro-release-OpenMandriva', 'gnupg', 'shadow', 'rpm-build', 'glibc-devel' ,'wget', 'task-devel', 'openmandriva-repos-pkgprefs', 'rpmlint-distro-policy', 'dwz', 'dnf')
config_opts['package_manager'] = 'dnf'
config_opts['dnf_common_opts'] = ['--refresh', '--disableplugin=local', '--setopt=deltarpm=False', '--forcearch=armv7hnl']
config_opts['dnf_builddep_opts'] = ['--refresh', '--forcearch=armv7hnl']
config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
-config_opts['releasever'] = '0' # at some point, this should be set by ABF
+config_opts['releasever'] = '0'
config_opts['use_nspawn'] = False
-config_opts['tar'] = "bsdtar"
+config_opts['tar'] = 'bsdtar'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['cache_topdir'] = '/var/cache/mock/'
-
-config_opts['dist'] = 'cooker' # only useful for --resultdir variable subst
+config_opts['nosync'] = True
+config_opts['plugin_conf']['tmpfs_enable'] = True
+config_opts['plugin_conf']['tmpfs_opts'] = {}
+config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 16000
+config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '80%'
+config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
+config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
+config_opts['dist'] = 'cooker'
config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['root_cache_enable'] = 'False'
-config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "xz"
-config_opts['plugin_conf']['root_cache_opts']['extension'] = ".xz"
+config_opts['plugin_conf']['root_cache_opts']['compress_program'] = ''
+config_opts['plugin_conf']['root_cache_opts']['extension'] = ''
+config_opts['plugin_conf']['root_cache_enable'] = True
+config_opts['plugin_conf']['root_cache_opts']['age_check'] = True
+config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 1
+config_opts['plugin_conf']['package_state_enable'] = True
+config_opts['plugin_conf']['package_state_opts'] = {}
+config_opts['plugin_conf']['package_state_opts']['available_pkgs'] = False
+config_opts['plugin_conf']['package_state_opts']['installed_pkgs'] = True
+
config_opts['yum.conf'] = """
[main]
keepcache=1
@@ -29,7 +42,7 @@ assumeyes=1
syslog_ident=mock
syslog_device=
install_weak_deps=0
-metadata_expire=0
+metadata_expire=60s
best=1
[cooker_main_release]
@@ -37,6 +50,4 @@ name=cooker_main_release
baseurl=http://abf-downloads.openmandriva.org/cooker/repository/armv7hnl/main/release
gpgcheck=0
enabled=1
-
"""
-
diff --git a/cooker-x86_64-main.cfg b/cooker-x86_64-main.cfg
index 3ebe10e..7c8d766 100644
--- a/cooker-x86_64-main.cfg
+++ b/cooker-x86_64-main.cfg
@@ -1,22 +1,35 @@
config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('i586', 'i686', 'x86_64')
-config_opts['root'] = 'openmandriva-x86_64'
-config_opts['chroot_setup_cmd'] = ('install', 'basesystem-minimal', 'locales', 'locales-en', 'distro-release-OpenMandriva', 'gnupg', 'shadow', 'rpm-build', 'glibc-devel' ,'wget', 'task-devel', 'clang', 'openmandriva-repos-pkgprefs', 'rpmlint-distro-policy', 'dwz')
+config_opts['legal_host_arches'] = ('i586', 'i686', 'x86_64', 'x86_64')
+config_opts['root'] = 'cooker-x86_64'
+config_opts['chroot_setup_cmd'] = ('install', 'basesystem-minimal', 'locales', 'locales-en', 'distro-release-OpenMandriva', 'gnupg', 'shadow', 'rpm-build', 'glibc-devel' ,'wget', 'task-devel', 'openmandriva-repos-pkgprefs', 'rpmlint-distro-policy', 'dwz', 'dnf')
config_opts['package_manager'] = 'dnf'
config_opts['dnf_common_opts'] = ['--refresh', '--disableplugin=local', '--setopt=deltarpm=False', '--forcearch=x86_64']
config_opts['dnf_builddep_opts'] = ['--refresh', '--forcearch=x86_64']
config_opts['useradd'] = '/usr/sbin/useradd -o -m -u %(uid)s -g %(gid)s -d %(home)s %(user)s'
-config_opts['releasever'] = '0' # at some point, this should be set by ABF
+config_opts['releasever'] = '0'
config_opts['use_nspawn'] = False
-config_opts['tar'] = "bsdtar"
+config_opts['tar'] = 'bsdtar'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['cache_topdir'] = '/var/cache/mock/'
-
-config_opts['dist'] = 'cooker' # only useful for --resultdir variable subst
+config_opts['nosync'] = True
+config_opts['plugin_conf']['tmpfs_enable'] = True
+config_opts['plugin_conf']['tmpfs_opts'] = {}
+config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 16000
+config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '80%'
+config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
+config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
+config_opts['dist'] = 'cooker'
config_opts['plugin_conf']['ccache_enable'] = False
-config_opts['plugin_conf']['root_cache_enable'] = 'False'
-config_opts['plugin_conf']['root_cache_opts']['compress_program'] = "xz"
-config_opts['plugin_conf']['root_cache_opts']['extension'] = ".xz"
+config_opts['plugin_conf']['root_cache_opts']['compress_program'] = ''
+config_opts['plugin_conf']['root_cache_opts']['extension'] = ''
+config_opts['plugin_conf']['root_cache_enable'] = True
+config_opts['plugin_conf']['root_cache_opts']['age_check'] = True
+config_opts['plugin_conf']['root_cache_opts']['max_age_days'] = 1
+config_opts['plugin_conf']['package_state_enable'] = True
+config_opts['plugin_conf']['package_state_opts'] = {}
+config_opts['plugin_conf']['package_state_opts']['available_pkgs'] = False
+config_opts['plugin_conf']['package_state_opts']['installed_pkgs'] = True
+
config_opts['yum.conf'] = """
[main]
keepcache=1
@@ -29,7 +42,7 @@ assumeyes=1
syslog_ident=mock
syslog_device=
install_weak_deps=0
-metadata_expire=0
+metadata_expire=60s
best=1
[cooker_main_release]
@@ -37,5 +50,4 @@ name=cooker_main_release
baseurl=http://abf-downloads.openmandriva.org/cooker/repository/x86_64/main/release
gpgcheck=0
enabled=1
-
"""