From ff4476dfd19157db20c012104b3da169b0d5a7e7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Jan 2017 11:48:24 +0100 Subject: php 7.1.1-2: EL-7 rebuild without dts --- mock/el7x71.cfg | 11 ++++++----- mock/el7xscl71.cfg | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mock/el7x71.cfg b/mock/el7x71.cfg index 7759bed..3025737 100644 --- a/mock/el7x71.cfg +++ b/mock/el7x71.cfg @@ -1,6 +1,7 @@ config_opts['root'] = 'el7x' config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain' +#config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst config_opts['plugin_conf']['ccache_enable'] = True @@ -24,9 +25,9 @@ config_opts['macros']['%rhel']="7" config_opts['macros']['%_with_ibase']="1" config_opts['macros']['%_with_oci8']="1" config_opts['macros']['%runselftest']="1" -config_opts['macros']['%dtsversion']="6" -config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable" -config_opts['macros']['%dtsprefix']="devtoolset-6-" +#config_opts['macros']['%dtsversion']="6" +#config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable" +#config_opts['macros']['%dtsprefix']="devtoolset-6-" config_opts['yum.conf'] = """ [main] @@ -126,7 +127,7 @@ enabled=1 [centos-sclo-rh] name=CentOS-7 - SCLo rh baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/ -enabled=1 +enabled=0 """ diff --git a/mock/el7xscl71.cfg b/mock/el7xscl71.cfg index 3a220dd..eec992a 100644 --- a/mock/el7xscl71.cfg +++ b/mock/el7xscl71.cfg @@ -1,6 +1,7 @@ config_opts['root'] = 'scl71el7x' config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build devtoolset-6-toolchain' +#config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build devtoolset-6-toolchain' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst config_opts['plugin_conf']['ccache_enable'] = True @@ -27,9 +28,9 @@ config_opts['macros']['%_with_ibase']="1" config_opts['macros']['%_with_oci8']="1" config_opts['macros']['%runselftest']="1" config_opts['macros']['%nophptag']="1" -config_opts['macros']['%dtsversion']="6" -config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable" -config_opts['macros']['%dtsprefix']="devtoolset-6-" +#config_opts['macros']['%dtsversion']="6" +#config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-6/enable" +#config_opts['macros']['%dtsprefix']="devtoolset-6-" config_opts['yum.conf'] = """ [main] @@ -123,7 +124,7 @@ enabled=1 [centos-sclo-rh] name=CentOS-7 - SCLo rh baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/ -enabled=1 +enabled=0 """ -- cgit