summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-12-26 10:15:32 +0100
committerRemi Collet <fedora@famillecollet.com>2016-12-26 10:15:32 +0100
commit566e097dc8b25480a2afcbce1d7c77c6d678b970 (patch)
treeb2a6a3717232479cced2d8de9d3dd992077b76ce
parent8eb83e2e61b027b6815f4f5b7ce1e856283d4cc3 (diff)
PHP 7.1: EL-7 rebuild using DTS
-rw-r--r--mock/el7x71.cfg10
-rw-r--r--mock/el7xscl71.cfg10
2 files changed, 18 insertions, 2 deletions
diff --git a/mock/el7x71.cfg b/mock/el7x71.cfg
index 78f7eaf..7759bed 100644
--- a/mock/el7x71.cfg
+++ b/mock/el7x71.cfg
@@ -1,6 +1,6 @@
config_opts['root'] = 'el7x'
config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain'
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
config_opts['plugin_conf']['ccache_enable'] = True
@@ -24,6 +24,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['yum.conf'] = """
[main]
@@ -120,6 +123,11 @@ name=result
baseurl=file:/var/lib/mock/el7x/
enabled=1
+[centos-sclo-rh]
+name=CentOS-7 - SCLo rh
+baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
+enabled=1
+
"""
diff --git a/mock/el7xscl71.cfg b/mock/el7xscl71.cfg
index 4593802..3a220dd 100644
--- a/mock/el7xscl71.cfg
+++ b/mock/el7xscl71.cfg
@@ -1,6 +1,6 @@
config_opts['root'] = 'scl71el7x'
config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php71-build devtoolset-6-toolchain'
config_opts['dist'] = 'el7' # only useful for --resultdir variable subst
config_opts['plugin_conf']['ccache_enable'] = True
@@ -27,6 +27,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['yum.conf'] = """
[main]
@@ -117,6 +120,11 @@ name=result
baseurl=file:/var/lib/mock/scl71el7x/
enabled=1
+[centos-sclo-rh]
+name=CentOS-7 - SCLo rh
+baseurl=http://mirror.centos.org/centos/7/sclo/$basearch/rh/
+enabled=1
+
"""