From 88e886aa1fc2047db374d998dd88fb6c7e32b7ce Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Dec 11 2019 17:14:23 +0000 Subject: make c7-kernel-alt.noarch build on x86_64 --- diff --git a/mock/c7-kernel-alt.noarch.cfg b/mock/c7-kernel-alt.noarch.cfg index fac41ee..97ee452 100644 --- a/mock/c7-kernel-alt.noarch.cfg +++ b/mock/c7-kernel-alt.noarch.cfg @@ -1,6 +1,6 @@ -config_opts['root'] = 'TARGETNAME' +config:_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'noarch' -config_opts['legal_host_arches'] = ('ppc64le','noarch',) +config_opts['legal_host_arches'] = ('x86_64','noarch',) config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils centos-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 @@ -14,7 +14,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'] = "ppc64le-redhat-linux-gnu" +config_opts['macros']['%_host'] = "x86_64-redhat-linux-gnu" config_opts['macros']['%_without_selftests'] = "1" config_opts['yum.conf'] = """ @@ -31,68 +31,158 @@ syslog_ident=mock syslog_device= # repos -[c7-extras.ppc64le] -name=c7-extras.ppc64le -baseurl=http://repohost/repo/c7-extras.ppc64le/ +[c7-extras.x86_64] +name=c7-extras.x86_64 +baseurl=http://repohost/repo/c7-extras.x86_64/ gpgcheck=0 -[c7.1708.u.ppc64le] -name=c7.1708.u.ppc64le -baseurl=http://repohost/repo/c7.1708.u.ppc64le/ +[c7.00.04] +name=c7.00.04 +enabled=1 +cost=1500 +baseurl=http://repohost/repo/c7.00.04/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + + +[c7.00.03] +name=c7.00.03 +enabled=1 +cost=1750 +baseurl=http://repohost/repo/c7.00.03/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.00.02] +name=c7.00.02 +enabled=1 +cost=2000 +baseurl=http://repohost/repo/c7.00.02/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7-updates] +name=c7-updates +enabled=1 +cost=1250 +baseurl=http://repohost/repo/c7-updates/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.01.00] +name=c7.01.00 +enabled=1 +cost=1000 +baseurl=http://repohost/repo/c7.01.00/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.01.u] +name=c7.01.u +enabled=1 +cost=750 +baseurl=http://repohost/repo/c7.01.u/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.1511.00] +name=c7.1511.00 +enabled=1 +cost=700 +baseurl=http://repohost/repo/c7.1511.00/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.1611.00] +name=c7.1611.00 +enabled=1 +cost=650 +baseurl=http://repohost/repo/c7.1611.00/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.1611.01] +name=c7.1611.01 +enabled=1 +cost=650 +baseurl=http://repohost/repo/c7.1611.01/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.1511.u] +name=c7.1511.u +enabled=1 +cost=675 +baseurl=http://repohost/repo/c7.1511.u/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.1611.u] +name=c7.1611.u +enabled=1 +cost=625 +baseurl=http://repohost/repo/c7.1611.u/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[c7.1708.u.x86_64] +name=c7.1708.u.x86_64 +baseurl=http://repohost/repo/c7.1708.u.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7.1708.00.ppc64le] -name=c7.1708.00.ppc64le -baseurl=http://repohost/repo/c7.1708.00.ppc64le/ +[c7.1708.00.x86_64] +name=c7.1708.00.x86_64 +baseurl=http://repohost/repo/c7.1708.00.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7.1804.u.ppc64le] -name=c7.1804.u.ppc64le -baseurl=http://repohost/repo/c7.1804.u.ppc64le/ +[c7.1804.u.x86_64] +name=c7.1804.u.x86_64 +baseurl=http://repohost/repo/c7.1804.u.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7.1804.00.ppc64le] -name=c7.1804.00.ppc64le -baseurl=http://repohost/repo/c7.1804.00.ppc64le/ +[c7.1804.00.x86_64] +name=c7.1804.00.x86_64 +baseurl=http://repohost/repo/c7.1804.00.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7-devtoolset-8.ppc64le] +[c7-devtoolset-8.x86_64] name=c7-devtoolset-8 -baseurl=http://repohost/repo/c7-devtoolset-8.ppc64le/ +baseurl=http://repohost/repo/c7-devtoolset-8.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7-llvm-toolset-7.0.ppc64le] +[c7-llvm-toolset-7.0.x86_64] name=c7-llvm-toolset-7.0 -baseurl=http://repohost/repo/c7-llvm-toolset-7.0.ppc64le/ +baseurl=http://repohost/repo/c7-llvm-toolset-7.0.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7-rust-toolset-1.35.ppc64le] +[c7-rust-toolset-1.35.x86_64] name=c7-rust-toolset-1.35 -baseurl=http://repohost/repo/c7-rust-toolset-1.35.ppc64le/ +baseurl=http://repohost/repo/c7-rust-toolset-1.35.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7-kernel-alt.ppc64le] +[c7-kernel-alt.x86_64] name=c7-kernel-alt -baseurl=http://repohost/repo/c7-kernel-alt.ppc64le/ +baseurl=http://repohost/repo/c7-kernel-alt.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7.1810.u.ppc64le] -name=c7.1810.u.ppc64le -baseurl=http://repohost/repo/c7.1810.u.ppc64le/ +[c7.1810.u.x86_64] +name=c7.1810.u.x86_64 +baseurl=http://repohost/repo/c7.1810.u.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7.1810.00.ppc64le] -name=c7.1810.00.ppc64le -baseurl=http://repohost/repo/c7.1810.00.ppc64le/ +[c7.1810.00.x86_64] +name=c7.1810.00.x86_64 +baseurl=http://repohost/repo/c7.1810.00.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7.1908.u.ppc64le] -name=c7.1908.u.ppc64le -baseurl=http://repohost/repo/c7.1908.u.ppc64le/ +[c7.1908.u.x86_64] +name=c7.1908.u.x86_64 +baseurl=http://repohost/repo/c7.1908.u.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -[c7.1908.00.ppc64le] -name=c7.1908.00.ppc64le -baseurl=http://repohost/repo/c7.1908.00.ppc64le/ +[c7.1908.00.x86_64] +name=c7.1908.00.x86_64 +baseurl=http://repohost/repo/c7.1908.00.x86_64/ gpgcheck=0 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 """