From 1cddb4d26c1a859d31cffd54fcfb0edeab4ab16c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 07:48:08 +0200 Subject: use --without apcu for PHP 5.x --- el6i.cfg | 2 ++ el6i55.cfg | 2 ++ el6i56.cfg | 2 ++ el6x.cfg | 2 ++ el6x55.cfg | 2 ++ el6x56.cfg | 2 ++ el6xscl54.cfg | 1 + el6xscl55.cfg | 1 + el6xscl56.cfg | 1 + el7x.cfg | 2 ++ el7x55.cfg | 2 ++ el7x56.cfg | 2 ++ el7xscl54.cfg | 1 + el7xscl55.cfg | 1 + el7xscl56.cfg | 1 + el8xscl56.cfg | 1 + fc31xscl56.cfg | 1 + fc32xscl56.cfg | 1 + fc33xscl56.cfg | 1 + 19 files changed, 28 insertions(+) diff --git a/el6i.cfg b/el6i.cfg index 0f5aed6..dbf31ae 100644 --- a/el6i.cfg +++ b/el6i.cfg @@ -1,5 +1,7 @@ include('el6i.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el6i55.cfg b/el6i55.cfg index fedeb8f..48c53c6 100644 --- a/el6i55.cfg +++ b/el6i55.cfg @@ -1,5 +1,7 @@ include('el6i.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el6i56.cfg b/el6i56.cfg index cefb85f..03dc5f3 100644 --- a/el6i56.cfg +++ b/el6i56.cfg @@ -1,5 +1,7 @@ include('el6i.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el6x.cfg b/el6x.cfg index 55ec6c6..f198b39 100644 --- a/el6x.cfg +++ b/el6x.cfg @@ -1,5 +1,7 @@ include('el6x.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el6x55.cfg b/el6x55.cfg index 0a1fef6..d2e4b48 100644 --- a/el6x55.cfg +++ b/el6x55.cfg @@ -1,5 +1,7 @@ include('el6x.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el6x56.cfg b/el6x56.cfg index c689b1c..219acd9 100644 --- a/el6x56.cfg +++ b/el6x56.cfg @@ -1,5 +1,7 @@ include('el6x.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el6xscl54.cfg b/el6xscl54.cfg index 4bfa7bc..be51ea0 100644 --- a/el6xscl54.cfg +++ b/el6xscl54.cfg @@ -7,6 +7,7 @@ config_opts['resultdir'] = "/var/lib/mock/scl54el6x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] = """ [main] diff --git a/el6xscl55.cfg b/el6xscl55.cfg index 4b200c5..46fe10f 100644 --- a/el6xscl55.cfg +++ b/el6xscl55.cfg @@ -7,6 +7,7 @@ config_opts['resultdir'] = "/var/lib/mock/scl55el6x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] = """ [main] diff --git a/el6xscl56.cfg b/el6xscl56.cfg index ac30de2..bc0eb1f 100644 --- a/el6xscl56.cfg +++ b/el6xscl56.cfg @@ -7,6 +7,7 @@ config_opts['resultdir'] = "/var/lib/mock/scl56el6x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] = """ [main] diff --git a/el7x.cfg b/el7x.cfg index de3d32e..c41f871 100644 --- a/el7x.cfg +++ b/el7x.cfg @@ -3,6 +3,8 @@ include('el7x.tpl') config_opts['root'] = 'el7x' config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache devtoolset-6-toolchain devtoolset-7-toolchain devtoolset-8-toolchain' +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el7x55.cfg b/el7x55.cfg index 92fa95f..1480fe5 100644 --- a/el7x55.cfg +++ b/el7x55.cfg @@ -1,5 +1,7 @@ include('el7x.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el7x56.cfg b/el7x56.cfg index 6de982d..52e4099 100644 --- a/el7x56.cfg +++ b/el7x56.cfg @@ -1,5 +1,7 @@ include('el7x.tpl') +config_opts['macros']['%_without_apcu']="1" + config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/el7xscl54.cfg b/el7xscl54.cfg index ed0683c..0ec402c 100644 --- a/el7xscl54.cfg +++ b/el7xscl54.cfg @@ -7,6 +7,7 @@ config_opts['resultdir'] = "/var/lib/mock/scl54el7x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] = """ [main] diff --git a/el7xscl55.cfg b/el7xscl55.cfg index e338b91..40408ac 100644 --- a/el7xscl55.cfg +++ b/el7xscl55.cfg @@ -7,6 +7,7 @@ config_opts['resultdir'] = "/var/lib/mock/scl55el7x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] = """ [main] diff --git a/el7xscl56.cfg b/el7xscl56.cfg index 5fcad76..9c3b1d0 100644 --- a/el7xscl56.cfg +++ b/el7xscl56.cfg @@ -7,6 +7,7 @@ config_opts['resultdir'] = "/var/lib/mock/scl56el7x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] = """ [main] diff --git a/el8xscl56.cfg b/el8xscl56.cfg index a22352c..95397cd 100644 --- a/el8xscl56.cfg +++ b/el8xscl56.cfg @@ -13,6 +13,7 @@ config_opts['macros']['%nophptag']="1" #config_opts['macros']['%_debugsource_packages']="%nil" # workaround for https://bugzilla.redhat.com/1485310 config_opts['macros']['%_build_id_links']='none' +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] += """ diff --git a/fc31xscl56.cfg b/fc31xscl56.cfg index 7e398fa..5721cd2 100644 --- a/fc31xscl56.cfg +++ b/fc31xscl56.cfg @@ -12,6 +12,7 @@ config_opts['macros']['%nophptag']="1" #config_opts['macros']['%_debugsource_packages']="%nil" # workaround for https://bugzilla.redhat.com/1485310 config_opts['macros']['%_build_id_links']='none' +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] += """ [result-scl56fc31x] diff --git a/fc32xscl56.cfg b/fc32xscl56.cfg index 3a61830..b6efd28 100644 --- a/fc32xscl56.cfg +++ b/fc32xscl56.cfg @@ -12,6 +12,7 @@ config_opts['macros']['%nophptag']="1" #config_opts['macros']['%_debugsource_packages']="%nil" # workaround for https://bugzilla.redhat.com/1485310 config_opts['macros']['%_build_id_links']='none' +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] += """ [result-scl56fc32x] diff --git a/fc33xscl56.cfg b/fc33xscl56.cfg index 2e1b4fb..5d4fd05 100644 --- a/fc33xscl56.cfg +++ b/fc33xscl56.cfg @@ -12,6 +12,7 @@ config_opts['macros']['%nophptag']="1" #config_opts['macros']['%_debugsource_packages']="%nil" # workaround for https://bugzilla.redhat.com/1485310 config_opts['macros']['%_build_id_links']='none' +config_opts['macros']['%_without_apcu']="1" config_opts['yum.conf'] += """ [result-scl56fc33x] -- cgit