From 82606807c9e890f896ef5a9cb842fc11284afffd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Feb 2024 14:08:46 +0100 Subject: 'f40: use legacy crypto --- fc40a.tpl | 2 +- fc40a74.cfg | 2 +- fc40a80.cfg | 1 - fc40a81.cfg | 1 - fc40a82.cfg | 1 - fc40a83.cfg | 1 - fc40ascl74.cfg | 2 +- fc40ascl80.cfg | 2 +- fc40ascl81.cfg | 2 +- fc40ascl82.cfg | 2 +- fc40ascl83.cfg | 2 +- fc40x.tpl | 12 +++++++++--- fc40x74.cfg | 1 - fc40x80.cfg | 1 - fc40x81.cfg | 1 - fc40x82.cfg | 1 - fc40x83.cfg | 1 - fc40xscl74.cfg | 2 +- fc40xscl80.cfg | 2 +- fc40xscl81.cfg | 2 +- fc40xscl82.cfg | 2 +- fc40xscl83.cfg | 2 +- 22 files changed, 21 insertions(+), 24 deletions(-) diff --git a/fc40a.tpl b/fc40a.tpl index 252ad6d..e3cda77 100644 --- a/fc40a.tpl +++ b/fc40a.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['root'] = 'fc40a' config_opts['target_arch'] = 'aarch64' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc remi-crypto-legacy' config_opts['dist'] = 'fc40' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '40' diff --git a/fc40a74.cfg b/fc40a74.cfg index 01b1fda..1a7f971 100644 --- a/fc40a74.cfg +++ b/fc40a74.cfg @@ -2,7 +2,7 @@ import datetime; include('fc40a.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache remi-crypto-legacy' config_opts['root'] = 'fc40a74' config_opts['resultdir'] = "/var/lib/mock/fc40a74" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a74/" diff --git a/fc40a80.cfg b/fc40a80.cfg index e16ae0e..a379efc 100644 --- a/fc40a80.cfg +++ b/fc40a80.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40a.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40a80' config_opts['resultdir'] = "/var/lib/mock/fc40a80" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a80/" diff --git a/fc40a81.cfg b/fc40a81.cfg index 9d13ba2..3e355a7 100644 --- a/fc40a81.cfg +++ b/fc40a81.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40a.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40a81' config_opts['resultdir'] = "/var/lib/mock/fc40a81" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a81/" diff --git a/fc40a82.cfg b/fc40a82.cfg index 07c695e..4015481 100644 --- a/fc40a82.cfg +++ b/fc40a82.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40a.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40a82' config_opts['resultdir'] = "/var/lib/mock/fc40a82" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a82/" diff --git a/fc40a83.cfg b/fc40a83.cfg index 1bcb437..a7c8252 100644 --- a/fc40a83.cfg +++ b/fc40a83.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40a.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40a83' config_opts['resultdir'] = "/var/lib/mock/fc40a83" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40a83/" diff --git a/fc40ascl74.cfg b/fc40ascl74.cfg index 722cbb6..c2290a9 100644 --- a/fc40ascl74.cfg +++ b/fc40ascl74.cfg @@ -1,7 +1,7 @@ include('fc40a.tpl') config_opts['root'] = 'scl74fc40a' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php74-build php74-php-devel php74-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl74fc40a" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl74/" diff --git a/fc40ascl80.cfg b/fc40ascl80.cfg index f0d755c..70553cd 100644 --- a/fc40ascl80.cfg +++ b/fc40ascl80.cfg @@ -1,7 +1,7 @@ include('fc40a.tpl') config_opts['root'] = 'scl80fc40a' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php80-build php80-php-devel php80-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl80fc40a" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl80/" diff --git a/fc40ascl81.cfg b/fc40ascl81.cfg index fda1106..14e1eeb 100644 --- a/fc40ascl81.cfg +++ b/fc40ascl81.cfg @@ -1,7 +1,7 @@ include('fc40a.tpl') config_opts['root'] = 'scl81fc40a' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php81-build php81-php-devel php81-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl81fc40a" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl81/" diff --git a/fc40ascl82.cfg b/fc40ascl82.cfg index 55c9f2c..1ff53e4 100644 --- a/fc40ascl82.cfg +++ b/fc40ascl82.cfg @@ -1,7 +1,7 @@ include('fc40a.tpl') config_opts['root'] = 'scl82fc40a' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php82-build php82-php-devel php82-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl82fc40a" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl82/" diff --git a/fc40ascl83.cfg b/fc40ascl83.cfg index d330648..844e783 100644 --- a/fc40ascl83.cfg +++ b/fc40ascl83.cfg @@ -1,7 +1,7 @@ include('fc40a.tpl') config_opts['root'] = 'scl83fc40a' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php83-build php83-php-devel php83-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php83-build php83-php-devel php83-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl83fc40a" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40ascl83/" diff --git a/fc40x.tpl b/fc40x.tpl index ae3ff4d..dc42c10 100644 --- a/fc40x.tpl +++ b/fc40x.tpl @@ -2,7 +2,7 @@ include('vendor.tpl') config_opts['root'] = 'fc40x' config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build gcc ccache remi-crypto-legacy' config_opts['dist'] = 'fc40' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['releasever'] = '40' @@ -86,12 +86,18 @@ enabled=1 skip_if_unavailable=True metadata_expire=10 -[remi-priv] -name=remi prive +[remi-priv-1] +name=remi prive 1 baseurl=file:/home/rpmbuild/site/rpms/priv/x86_64/ enabled=1 metadata_expire=10 +[remi-priv-2] +name=remi prive 2 +baseurl=file:/home/rpmbuild/site/rpms/priv/fc40.x86_64/ +enabled=1 +metadata_expire=10 + [remi-debuginfo] name=remi-debuginfo baseurl=file:/home/rpmbuild/site/rpms/fedora/40/debug-remi/x86_64/ diff --git a/fc40x74.cfg b/fc40x74.cfg index 8f628ef..67f196c 100644 --- a/fc40x74.cfg +++ b/fc40x74.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40x.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40x74' config_opts['resultdir'] = "/var/lib/mock/fc40x74" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x74/" diff --git a/fc40x80.cfg b/fc40x80.cfg index ff262ce..a1eccf5 100644 --- a/fc40x80.cfg +++ b/fc40x80.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40x.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40x80' config_opts['resultdir'] = "/var/lib/mock/fc40x80" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x80/" diff --git a/fc40x81.cfg b/fc40x81.cfg index 09c5dc6..4b82a05 100644 --- a/fc40x81.cfg +++ b/fc40x81.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40x.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40x81' config_opts['resultdir'] = "/var/lib/mock/fc40x81" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x81/" diff --git a/fc40x82.cfg b/fc40x82.cfg index ea51a49..ba33c8b 100644 --- a/fc40x82.cfg +++ b/fc40x82.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40x.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40x82' config_opts['resultdir'] = "/var/lib/mock/fc40x82" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x82/" diff --git a/fc40x83.cfg b/fc40x83.cfg index 9750240..a20353d 100644 --- a/fc40x83.cfg +++ b/fc40x83.cfg @@ -2,7 +2,6 @@ import datetime; include('fc40x.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache' config_opts['root'] = 'fc40x83' config_opts['resultdir'] = "/var/lib/mock/fc40x83" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40x83/" diff --git a/fc40xscl74.cfg b/fc40xscl74.cfg index 7bf6dd7..e112ece 100644 --- a/fc40xscl74.cfg +++ b/fc40xscl74.cfg @@ -1,7 +1,7 @@ include('fc40x.tpl') config_opts['root'] = 'scl74fc40x' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php74-build php74-php-devel php74-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php74-build php74-php-devel php74-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl74fc40x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl74/" diff --git a/fc40xscl80.cfg b/fc40xscl80.cfg index 76570a8..8b7bd18 100644 --- a/fc40xscl80.cfg +++ b/fc40xscl80.cfg @@ -1,7 +1,7 @@ include('fc40x.tpl') config_opts['root'] = 'scl80fc40x' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php80-build php80-php-devel php80-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php80-build php80-php-devel php80-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl80fc40x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl80/" diff --git a/fc40xscl81.cfg b/fc40xscl81.cfg index 875a915..6ef7214 100644 --- a/fc40xscl81.cfg +++ b/fc40xscl81.cfg @@ -1,7 +1,7 @@ include('fc40x.tpl') config_opts['root'] = 'scl81fc40x' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php81-build php81-php-devel php81-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php81-build php81-php-devel php81-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl81fc40x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl81/" diff --git a/fc40xscl82.cfg b/fc40xscl82.cfg index 507d385..20a6262 100644 --- a/fc40xscl82.cfg +++ b/fc40xscl82.cfg @@ -1,7 +1,7 @@ include('fc40x.tpl') config_opts['root'] = 'scl82fc40x' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php82-build php82-php-devel php82-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php82-build php82-php-devel php82-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl82fc40x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl82/" diff --git a/fc40xscl83.cfg b/fc40xscl83.cfg index f9e43b0..035ea26 100644 --- a/fc40xscl83.cfg +++ b/fc40xscl83.cfg @@ -1,7 +1,7 @@ include('fc40x.tpl') config_opts['root'] = 'scl83fc40x' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build php83-build php83-php-devel php83-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build remi-crypto-legacy ccache scl-utils-build php83-build php83-php-devel php83-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl83fc40x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc40xscl83/" -- cgit