From abb00ac85283c0df3ba219a3025392cf1eb9b74b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Jun 2021 19:25:09 +0200 Subject: disable msprod by default (too often broken and unneeded for most build) --- el7x70.cfg | 2 +- el7x71.cfg | 2 +- el7x72.cfg | 2 +- el7x73.cfg | 2 +- el7x74.cfg | 2 +- el7x80.cfg | 2 +- el7xscl70.cfg | 2 +- el7xscl71.cfg | 2 +- el7xscl72.cfg | 2 +- el7xscl73.cfg | 2 +- el7xscl74.cfg | 2 +- el7xscl80.cfg | 2 +- el7xscl81.cfg | 10 +++++----- el8x.tpl | 2 +- fc31x.tpl | 2 +- fc32x.tpl | 2 +- fc33x.tpl | 2 +- fc34x.tpl | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/el7x70.cfg b/el7x70.cfg index 550505d..88e63ec 100644 --- a/el7x70.cfg +++ b/el7x70.cfg @@ -95,7 +95,7 @@ enabled=1 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7x71.cfg b/el7x71.cfg index b5b235e..2b61f28 100644 --- a/el7x71.cfg +++ b/el7x71.cfg @@ -105,7 +105,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7x72.cfg b/el7x72.cfg index a779ab6..f6f6f22 100644 --- a/el7x72.cfg +++ b/el7x72.cfg @@ -105,7 +105,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7x73.cfg b/el7x73.cfg index 21bdde1..62ce82c 100644 --- a/el7x73.cfg +++ b/el7x73.cfg @@ -105,7 +105,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7x74.cfg b/el7x74.cfg index 0f9f424..199a1d1 100644 --- a/el7x74.cfg +++ b/el7x74.cfg @@ -105,7 +105,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7x80.cfg b/el7x80.cfg index 2733af6..f049f9c 100644 --- a/el7x80.cfg +++ b/el7x80.cfg @@ -105,7 +105,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7xscl70.cfg b/el7xscl70.cfg index a29d957..0bb5c70 100644 --- a/el7xscl70.cfg +++ b/el7xscl70.cfg @@ -103,7 +103,7 @@ enabled=1 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7xscl71.cfg b/el7xscl71.cfg index 066224a..55a5ba4 100644 --- a/el7xscl71.cfg +++ b/el7xscl71.cfg @@ -112,7 +112,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7xscl72.cfg b/el7xscl72.cfg index 35e71ac..cf806cb 100644 --- a/el7xscl72.cfg +++ b/el7xscl72.cfg @@ -112,7 +112,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7xscl73.cfg b/el7xscl73.cfg index e9ff716..5a19a81 100644 --- a/el7xscl73.cfg +++ b/el7xscl73.cfg @@ -112,7 +112,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7xscl74.cfg b/el7xscl74.cfg index d6d047e..050db86 100644 --- a/el7xscl74.cfg +++ b/el7xscl74.cfg @@ -112,7 +112,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7xscl80.cfg b/el7xscl80.cfg index db80b94..098685a 100644 --- a/el7xscl80.cfg +++ b/el7xscl80.cfg @@ -112,7 +112,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el7xscl81.cfg b/el7xscl81.cfg index 7daa97c..11027c3 100644 --- a/el7xscl81.cfg +++ b/el7xscl81.cfg @@ -1,15 +1,15 @@ include('el7x.tpl') config_opts['root'] = 'scl81el7x' -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-8-toolchain ccache php81-build php81-php-devel php81-php-pear' +config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-build devtoolset-10-toolchain ccache php81-build php81-php-devel php81-php-pear' config_opts['resultdir'] = "/var/lib/mock/scl81el7x" config_opts['macros']['%scl_vendor']="remi" config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" -config_opts['macros']['%dtsversion']="8" -config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-8/enable" -config_opts['macros']['%dtsprefix']="devtoolset-8-" +config_opts['macros']['%dtsversion']="10" +config_opts['macros']['%dtsenable']="source /opt/rh/devtoolset-10/enable" +config_opts['macros']['%dtsprefix']="devtoolset-10-" config_opts['yum.conf'] = """ [main] @@ -112,7 +112,7 @@ enabled=0 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/el8x.tpl b/el8x.tpl index 3ade702..59bdb85 100644 --- a/el8x.tpl +++ b/el8x.tpl @@ -112,7 +112,7 @@ enabled=1 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/8/prod/ -enabled=1 +enabled=0 includepkgs=msodbcsql17 """ diff --git a/fc31x.tpl b/fc31x.tpl index cb9c4db..46cb107 100644 --- a/fc31x.tpl +++ b/fc31x.tpl @@ -97,6 +97,6 @@ enabled=1 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 """ diff --git a/fc32x.tpl b/fc32x.tpl index 83a1ca0..5a81c6c 100644 --- a/fc32x.tpl +++ b/fc32x.tpl @@ -99,6 +99,6 @@ enabled=1 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 """ diff --git a/fc33x.tpl b/fc33x.tpl index a177414..081be7d 100644 --- a/fc33x.tpl +++ b/fc33x.tpl @@ -99,6 +99,6 @@ enabled=1 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 """ diff --git a/fc34x.tpl b/fc34x.tpl index 0a9c1d6..d090156 100644 --- a/fc34x.tpl +++ b/fc34x.tpl @@ -99,6 +99,6 @@ enabled=1 [msprod] name=msprod baseurl=https://packages.microsoft.com/rhel/7/prod/ -enabled=1 +enabled=0 """ -- cgit