drop php-devel from buildroot, enable F30 testing

11 files changed, 13 insertions, 11 deletions

diff --git a/el6i.cfg b/el6i.cfg
index 503b20e..5f79055 100644
--- a/el6i.cfg
+++ b/el6i.cfg
@@ -44,6 +44,7 @@ syslog_device=
 name=rhel-6
 baseurl=file:/mnt/rhel-6-i386/
 enabled=1
+exclude=gd-devel libwebp-devel
 
 [beta]
 name=beta
diff --git a/el6x.cfg b/el6x.cfg
index 5fa5d66..ffc728c 100644
--- a/el6x.cfg
+++ b/el6x.cfg
@@ -44,6 +44,7 @@ syslog_device=
 name=rhel-6
 baseurl=file:/mnt/rhel-6-x86_64/
 enabled=1
+exclude=gd-devel libwebp-devel
 
 [beta]
 name=beta
diff --git a/el8xscl56.cfg b/el8xscl56.cfg
index ffe92a9..0cc3422 100644
--- a/el8xscl56.cfg
+++ b/el8xscl56.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'scl56el8x'
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build php56-php-devel'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php56-build'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
diff --git a/el8xscl70.cfg b/el8xscl70.cfg
index e1417d2..b41387b 100644
--- a/el8xscl70.cfg
+++ b/el8xscl70.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'scl70el8x'
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build php70-php-devel'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php70-build'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
diff --git a/el8xscl71.cfg b/el8xscl71.cfg
index e61ae7f..05c14de 100644
--- a/el8xscl71.cfg
+++ b/el8xscl71.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'scl71el8x'
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build php71-build php71-php-devel'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build php71-build'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
diff --git a/el8xscl72.cfg b/el8xscl72.cfg
index c0c3717..ac6141d 100644
--- a/el8xscl72.cfg
+++ b/el8xscl72.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'scl72el8x'
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build php72-build php72-php-devel'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build nss crypto-policies php72-build'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
diff --git a/el8xscl73.cfg b/el8xscl73.cfg
index 07dad45..d85027c 100644
--- a/el8xscl73.cfg
+++ b/el8xscl73.cfg
@@ -1,7 +1,7 @@
 config_opts['root'] = 'scl73el8x'
 config_opts['target_arch'] = 'x86_64'
 #config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
-config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils-build php73-build php73-php-devel nss crypto-policies'
+config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils redhat-release findutils gawk gcc grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz nss crypto-policies scl-utils-build php73-build'
 config_opts['dist'] = 'el8'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '8'
diff --git a/fc30i.cfg b/fc30i.cfg
index d40a686..cdda4f4 100644
--- a/fc30i.cfg
+++ b/fc30i.cfg
@@ -73,7 +73,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$relea
 failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f30&arch=i386
 #baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/30/i386
-enabled=0
+enabled=1
 
 [remi]
 name=remi public
diff --git a/fc30x.cfg b/fc30x.cfg
index 5d62ef8..4a17b15 100644
--- a/fc30x.cfg
+++ b/fc30x.cfg
@@ -72,7 +72,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$relea
 failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f30&arch=x86_64
 #baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/30/x86_64/
-enabled=0
+enabled=1
 
 [remi]
 name=remi public
diff --git a/fc30xscl56.cfg b/fc30xscl56.cfg
index e2dd5d8..3cf773b 100644
--- a/fc30xscl56.cfg
+++ b/fc30xscl56.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'scl56fc30x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php56-build php56-php-devel php56-php-pear'
+config_opts['chroot_setup_cmd'] = 'install @buildsys-build scl-utils-build php56-build'
 config_opts['dist'] = 'fc30'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '30'
@@ -78,7 +78,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$relea
 failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f30&arch=x86_64
 #baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/testing/30/x86_64/
-enabled=0
+enabled=1
 
 [remi]
 name=remi public
diff --git a/fc30xscl70.cfg b/fc30xscl70.cfg
index 9f3c1f8..af6d16c 100644
--- a/fc30xscl70.cfg
+++ b/fc30xscl70.cfg
@@ -1,6 +1,6 @@
 config_opts['root'] = 'scl70fc30x'
 config_opts['target_arch'] = 'x86_64'
-config_opts['chroot_setup_cmd'] = 'install   @buildsys-build scl-utils-build php70-build php70-php-devel php70-php-pear'
+config_opts['chroot_setup_cmd'] = 'install   @buildsys-build scl-utils-build php70-build'
 config_opts['dist'] = 'fc30'  # only useful for --resultdir variable subst
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
 config_opts['releasever'] = '30'
@@ -81,7 +81,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$relea
 failovermethod=priority
 #mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f30&arch=x86_64
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/30/x86_64/
-enabled=0
+enabled=1
 
 [remi]
 name=remi public