From 92dc54837f1a258ffe188349082153f3726f8ae2 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Feb 05 2020 15:33:18 +0000 Subject: update host=i386 to host=i686 --- diff --git a/mock/c7-devtoolset-6.i386.cfg b/mock/c7-devtoolset-6.i386.cfg index 71f04f2..1893f67 100644 --- a/mock/c7-devtoolset-6.i386.cfg +++ b/mock/c7-devtoolset-6.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-devtoolset-7.i386.cfg b/mock/c7-devtoolset-7.i386.cfg index 47fad04..e5a9d39 100644 --- a/mock/c7-devtoolset-7.i386.cfg +++ b/mock/c7-devtoolset-7.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-devtoolset-8.i386.cfg b/mock/c7-devtoolset-8.i386.cfg index 9c7d5ed..113873f 100644 --- a/mock/c7-devtoolset-8.i386.cfg +++ b/mock/c7-devtoolset-8.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-exp.i386.cfg b/mock/c7-exp.i386.cfg index 2af480e..d3f6962 100644 --- a/mock/c7-exp.i386.cfg +++ b/mock/c7-exp.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-extras.i386.cfg b/mock/c7-extras.i386.cfg deleted file mode 120000 index d2abb56..0000000 --- a/mock/c7-extras.i386.cfg +++ /dev/null @@ -1 +0,0 @@ -c7-extras.i686.cfg \ No newline at end of file diff --git a/mock/c7-extras.i386.cfg b/mock/c7-extras.i386.cfg new file mode 100644 index 0000000..b6aa887 --- /dev/null +++ b/mock/c7-extras.i386.cfg @@ -0,0 +1,149 @@ +config_opts['root'] = 'TARGETNAME' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',) +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz scl-utils go-toolset-7-build go-toolset-1.10-build' +config_opts['dist'] = 'el7' # only useful for --resultdir variable subst + +config_opts['%centos_ver'] = "7" +config_opts['macros']['%centos_ver'] = "7" +config_opts['macros']['%rhel'] = "7" +config_opts['macros']['%el7'] = "1" +config_opts['macros']['%redhat'] = "7" +config_opts['macros']['%vendor'] = "CentOS" +config_opts['macros']['%packager'] = "CentOS BuildSystem " +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +exclude=*.x86_64 redhat-logos redhat-release* fakesystemd systemd-container* + +# repos +[c7.00.04] +name=c7.00.04 +enabled=1 +baseurl=http://repohost/repo/c7.00.04/ + +[c7.00.03] +name=c7.00.03 +enabled=1 +baseurl=http://repohost/repo/c7.00.03/ + +[c7.00.02] +name=c7.00.02 +enabled=1 +baseurl=http://repohost/repo/c7.00.02/ + +[c7.00.00] +name=c7.00.00 +enabled=1 +baseurl=http://repohost/repo/c7.00.00/ + +[c7-extras.i386] +name=c7-extras.i386 +enabled=1 +baseurl=http://repohost/repo/c7-extras.i386/ + +[c7-updates] +name=c7-updates +enabled=1 +baseurl=http://repohost/repo/c7-updates/ + +[c7.01.00] +name=c7.01.00 +enabled=1 +baseurl=http://repohost/repo/c7.01.00/ + +[c7.01.u] +name=c7.01.u +enabled=1 +baseurl=http://repohost/repo/c7.01.u/ + +[c7.1511.u] +name=c7.1511.u +enabled=1 +baseurl=http://repohost/repo/c7.1511.u/ + +[c7.1511.00] +name=c7.1511.00 +enabled=1 +baseurl=http://repohost/repo/c7.1511.00/ + +[c7.1611.u] +name=c7.1611.u +enabled=1 +baseurl=http://repohost/repo/c7.1611.u/ + +[c7.1611.00] +name=c7.1611.00 +enabled=1 +baseurl=http://repohost/repo/c7.1611.00/ + +[c7.1611.01] +name=c7.1611.01 +enabled=1 +baseurl=http://repohost/repo/c7.1611.01/ + +[c7.1708.u.i386] +name=c7.1708.u.i386 +enabled=1 +baseurl=http://repohost/repo/c7.1708.u.i386/ + +[c7.1708.00] +name=c7.1708.00 +enabled=1 +baseurl=http://repohost/repo/c7.1708.00/ + +[c7.1804.u.i386] +name=c7.1804.u.i386 +enabled=1 +baseurl=http://repohost/repo/c7.1804.u.i386/ + +[c7.1804.00.i386] +name=c7.1804.00.i386 +enabled=1 +baseurl=http://repohost/repo/c7.1804.00.i386/ +[c7.1810.u.i386] +name=c7.1810.u.i386 +enabled=1 +baseurl=http://repohost/repo/c7.1810.u.i386/ + +[c7.1810.00.i386] +name=c7.1810.00.i386 +enabled=1 +baseurl=http://repohost/repo/c7.1810.00.i386/ + +[c7-go-toolset-7.i386] +name=c7-go-toolset-7.i386 +enabled=1 +baseurl=http://repohost/repo/c7-go-toolset-7.i386/ +gpgcheck=0 + +[c7-go-toolset-1.10.i386] +name=c7-go-toolset-1.10.i386 +enabled=1 +baseurl=http://repohost/repo/c7-go-toolset-1.10.i386/ +gpgcheck=0 + +[c7.1908.u.i386] +name=c7.1908.u.i386 +enabled=1 +baseurl=http://repohost/repo/c7.1908.u.i386/ + +[c7.1908.00.i386] +name=c7.1908.00.i386 +enabled=1 +baseurl=http://repohost/repo/c7.1908.00.i386/ +""" diff --git a/mock/c7-fasttrack.i386.cfg b/mock/c7-fasttrack.i386.cfg index 117e44d..9c8e8b6 100644 --- a/mock/c7-fasttrack.i386.cfg +++ b/mock/c7-fasttrack.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-firefox60.i386.cfg b/mock/c7-firefox60.i386.cfg index b82e160..95d9b7a 100644 --- a/mock/c7-firefox60.i386.cfg +++ b/mock/c7-firefox60.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-firefox68.i386.cfg b/mock/c7-firefox68.i386.cfg index bee1f15..0f1ede3 100644 --- a/mock/c7-firefox68.i386.cfg +++ b/mock/c7-firefox68.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-go-toolset-1.10.i386.cfg b/mock/c7-go-toolset-1.10.i386.cfg index 37f9e89..7ef33f0 100644 --- a/mock/c7-go-toolset-1.10.i386.cfg +++ b/mock/c7-go-toolset-1.10.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-go-toolset-7.i386.cfg b/mock/c7-go-toolset-7.i386.cfg index 3746470..e45bdfe 100644 --- a/mock/c7-go-toolset-7.i386.cfg +++ b/mock/c7-go-toolset-7.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-kernels.i386.cfg b/mock/c7-kernels.i386.cfg index 2af480e..d3f6962 100644 --- a/mock/c7-kernels.i386.cfg +++ b/mock/c7-kernels.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-llvm-toolset-7.0.i386.cfg b/mock/c7-llvm-toolset-7.0.i386.cfg index eec6f1a..49c7388 100644 --- a/mock/c7-llvm-toolset-7.0.i386.cfg +++ b/mock/c7-llvm-toolset-7.0.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-llvm-toolset-7.i386.cfg b/mock/c7-llvm-toolset-7.i386.cfg index 87d226c..ea652d8 100644 --- a/mock/c7-llvm-toolset-7.i386.cfg +++ b/mock/c7-llvm-toolset-7.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-plus.i386.cfg b/mock/c7-plus.i386.cfg index c836b3a..96fcccf 100644 --- a/mock/c7-plus.i386.cfg +++ b/mock/c7-plus.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ diff --git a/mock/c7-rh-python36.i386.cfg b/mock/c7-rh-python36.i386.cfg index 698ebdd..a66f12f 100644 --- a/mock/c7-rh-python36.i386.cfg +++ b/mock/c7-rh-python36.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-rt.i386.cfg b/mock/c7-rt.i386.cfg index 1d5967c..61bece6 100644 --- a/mock/c7-rt.i386.cfg +++ b/mock/c7-rt.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-rust-toolset-1.35.i386.cfg b/mock/c7-rust-toolset-1.35.i386.cfg index 841d7a5..1ff5403 100644 --- a/mock/c7-rust-toolset-1.35.i386.cfg +++ b/mock/c7-rust-toolset-1.35.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-rust-toolset-7.i386.cfg b/mock/c7-rust-toolset-7.i386.cfg index ffd9f79..2c485cb 100644 --- a/mock/c7-rust-toolset-7.i386.cfg +++ b/mock/c7-rust-toolset-7.i386.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7-updates-i386.cfg b/mock/c7-updates-i386.cfg deleted file mode 120000 index 6ce9007..0000000 --- a/mock/c7-updates-i386.cfg +++ /dev/null @@ -1 +0,0 @@ -c7-updates-i686.cfg \ No newline at end of file diff --git a/mock/c7-updates-i386.cfg b/mock/c7-updates-i386.cfg new file mode 100644 index 0000000..64865ab --- /dev/null +++ b/mock/c7-updates-i386.cfg @@ -0,0 +1,65 @@ +config_opts['root'] = 'c7-updates-i686' +config_opts['basedir'] = 'MOCKROOT' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',) +config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils system-release findutils gawk gcc gcc-c++ grep gzip info make patch redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux which xz' +config_opts['dist'] = 'el7' # only useful for --resultdir variable subst + +config_opts['%centos_ver'] = "7" +config_opts['macros']['%centos_ver'] = "7" +config_opts['macros']['%rhel'] = "7" +config_opts['macros']['%el7'] = "1" +config_opts['macros']['%redhat'] = "7" +config_opts['macros']['%vendor'] = "CentOS" +config_opts['macros']['%packager'] = "CentOS BuildSystem " +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +exclude=*.x86_64 redhat-logos redhat-release* + +# repos +[c7.00.04] +name=c7.00.04 +enabled=1 +cost=500 +baseurl=http://repohost/tmp/repo/c7.00.04/ + +[c7.00.03] +name=c7.00.03 +enabled=1 +cost=750 +baseurl=http://repohost/tmp/repo/c7.00.03/ + +[c7.00.02] +name=c7.00.02 +enabled=1 +cost=1000 +baseurl=http://repohost/tmp/repo/c7.00.02/ + +[c7.00.00] +name=c7.00.00 +enabled=1 +cost=1500 +baseurl=http://repohost/tmp/repo/c7.00.00/ + +[c7-updates] +name=c7-updates +enabled=1 +cost=500 +baseurl=http://repohost/tmp/repo/c7-updates/ + +""" diff --git a/mock/c7.1908.00.i686.cfg b/mock/c7.1908.00.i686.cfg index ba09265..5b05c11 100644 --- a/mock/c7.1908.00.i686.cfg +++ b/mock/c7.1908.00.i686.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main] diff --git a/mock/c7.1908.u.i686.cfg b/mock/c7.1908.u.i686.cfg index f970005..c3ec085 100644 --- a/mock/c7.1908.u.i686.cfg +++ b/mock/c7.1908.u.i686.cfg @@ -13,7 +13,7 @@ config_opts['macros']['%vendor'] = "CentOS" config_opts['macros']['%packager'] = "CentOS BuildSystem " config_opts['macros']['%_vendor'] = "redhat" config_opts['macros']['%_vendor_host'] = "redhat" -config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%_host'] = "i686-redhat-linux-gnu" config_opts['yum.conf'] = """ [main]