EL7: always install both dts 6 and 7

9 files changed, 9 insertions, 9 deletions

diff --git a/el7t55.cfg b/el7t55.cfg
index e4806a6..69f24f3 100644
--- a/el7t55.cfg
+++ b/el7t55.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7t56.cfg b/el7t56.cfg
index b733672..42b56ea 100644
--- a/el7t56.cfg
+++ b/el7t56.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7x.cfg b/el7x.cfg
index a93416e..7a38d91 100644
--- a/el7x.cfg
+++ b/el7x.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7x55.cfg b/el7x55.cfg
index f77757b..7a26ddd 100644
--- a/el7x55.cfg
+++ b/el7x55.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7x56.cfg b/el7x56.cfg
index a50fc80..18b737d 100644
--- a/el7x56.cfg
+++ b/el7x56.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7x70.cfg b/el7x70.cfg
index df5c044..26dfbc8 100644
--- a/el7x70.cfg
+++ b/el7x70.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7x71.cfg b/el7x71.cfg
index 10cfe6a..e2d6cce 100644
--- a/el7x71.cfg
+++ b/el7x71.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7x72.cfg b/el7x72.cfg
index 04370ee..b81bda3 100644
--- a/el7x72.cfg
+++ b/el7x72.cfg
@@ -1,6 +1,6 @@
 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 devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True
diff --git a/el7x73.cfg b/el7x73.cfg
index 88f4d66..daeee7a 100644
--- a/el7x73.cfg
+++ b/el7x73.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'el7x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-7-toolchain'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build devtoolset-6-toolchain devtoolset-7-toolchain'
 config_opts['dist'] = 'el7'  # only useful for --resultdir variable subst
 
 config_opts['plugin_conf']['ccache_enable'] = True