From cbf51cdad275f0212e08a24346b2bf7a941f2470 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Aug 21 2019 15:33:29 +0000 Subject: fix c7-devtoolset-8 for kernelbuilds --- diff --git a/mock/c7-devtoolset-8.aarch64.cfg b/mock/c7-devtoolset-8.aarch64.cfg index 1b621d3..c30b6b6 100644 --- a/mock/c7-devtoolset-8.aarch64.cfg +++ b/mock/c7-devtoolset-8.aarch64.cfg @@ -1,6 +1,6 @@ config_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'aarch64' -config_opts['legal_host_arches'] = ('aarch64',) +config_opts['legal_host_arches'] = ('aarch64','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 scl-utils-build devtoolset-8-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst diff --git a/mock/c7-devtoolset-8.armhfp.cfg b/mock/c7-devtoolset-8.armhfp.cfg index 210ad8f..a353aea 100644 --- a/mock/c7-devtoolset-8.armhfp.cfg +++ b/mock/c7-devtoolset-8.armhfp.cfg @@ -1,6 +1,6 @@ config_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'armv7hl' -config_opts['legal_host_arches'] = ('armv7l') +config_opts['legal_host_arches'] = ('armv7l','noarch') 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-build devtoolset-8-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] diff --git a/mock/c7-devtoolset-8.i386.cfg b/mock/c7-devtoolset-8.i386.cfg index 416c3b0..9c7d5ed 100644 --- a/mock/c7-devtoolset-8.i386.cfg +++ b/mock/c7-devtoolset-8.i386.cfg @@ -1,6 +1,6 @@ config_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'i686' -config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64',) +config_opts['legal_host_arches'] = ('i386', 'i486', 'i586', 'i686', 'x86_64', 'noarch') 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-build devtoolset-8-build ' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst diff --git a/mock/c7-devtoolset-8.noarch.cfg b/mock/c7-devtoolset-8.noarch.cfg deleted file mode 100644 index 10008c9..0000000 --- a/mock/c7-devtoolset-8.noarch.cfg +++ /dev/null @@ -1,163 +0,0 @@ -config_opts['root'] = 'TARGETNAME' -config_opts['target_arch'] = 'noarch' -config_opts['legal_host_arches'] = ('x86_64','noarch',) -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-build devtoolset-8-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'] = "x86_64-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= - -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 -exclude=redhat-logos redhat-release* fakesystemd systemd-container* - -# repos -[c7.00.04] -name=c7.00.04 -enabled=1 -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 -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 -baseurl=http://repohost/repo/c7.00.02/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7-extras.x86_64] -name=c7-extras.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7-extras.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7-updates] -name=c7-updates -enabled=1 -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 -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 -baseurl=http://repohost/repo/c7.01.u/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1511.u] -name=c7.1511.u -enabled=1 -baseurl=http://repohost/repo/c7.1511.u/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1511.00] -name=c7.1511.00 -enabled=1 -baseurl=http://repohost/repo/c7.1511.00/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1611.u] -name=c7.1611.u -enabled=1 -baseurl=http://repohost/repo/c7.1611.u/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1611.00] -name=c7.1611.00 -enabled=1 -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 -baseurl=http://repohost/repo/c7.1611.01/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1708.u.x86_64] -name=c7.1708.u.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7.1708.u.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1708.00] -name=c7.1708.00 -enabled=1 -baseurl=http://repohost/repo/c7.1708.00/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1804.u.x86_64] -name=c7.1804.u.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7.1804.u.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1804.00.x86_64] -name=c7.1804.00.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7.1804.00.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7-devtoolset-8] -name=c7-devtoolset-8 -enabled=1 -baseurl=http://repohost/repo/c7-devtoolset-8.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1810.u.x86_64] -name=c7.1810.u.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7.1810.u.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1810.00.x86_64] -name=c7.1810.00.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7.1810.00.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1908.u.x86_64] -name=c7.1908.u.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7.1908.u.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -[c7.1908.00.x86_64] -name=c7.1908.00.x86_64 -enabled=1 -baseurl=http://repohost/repo/c7.1908.00.x86_64/ -includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 - -""" diff --git a/mock/c7-devtoolset-8.ppc.cfg b/mock/c7-devtoolset-8.ppc.cfg index 0079bb0..7620f93 100644 --- a/mock/c7-devtoolset-8.ppc.cfg +++ b/mock/c7-devtoolset-8.ppc.cfg @@ -1,6 +1,6 @@ config_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'ppc' -config_opts['legal_host_arches'] = ('ppc','ppc64') +config_opts['legal_host_arches'] = ('ppc','ppc64',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 scl-utils-build devtoolset-8-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst diff --git a/mock/c7-devtoolset-8.ppc64.cfg b/mock/c7-devtoolset-8.ppc64.cfg index ffbabb5..61cf670 100644 --- a/mock/c7-devtoolset-8.ppc64.cfg +++ b/mock/c7-devtoolset-8.ppc64.cfg @@ -1,6 +1,6 @@ config_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'ppc64' -config_opts['legal_host_arches'] = ('ppc64',) +config_opts['legal_host_arches'] = ('ppc64','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 scl-utils-build devtoolset-8-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst diff --git a/mock/c7-devtoolset-8.ppc64le.cfg b/mock/c7-devtoolset-8.ppc64le.cfg index ec4f54b..6e7b519 100644 --- a/mock/c7-devtoolset-8.ppc64le.cfg +++ b/mock/c7-devtoolset-8.ppc64le.cfg @@ -1,6 +1,6 @@ config_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'ppc64le' -config_opts['legal_host_arches'] = ('ppc64le',) +config_opts['legal_host_arches'] = ('ppc64le','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 scl-utils-build devtoolset-8-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst diff --git a/mock/c7-devtoolset-8.x86_64.cfg b/mock/c7-devtoolset-8.x86_64.cfg index ba2c5e4..9c8f688 100644 --- a/mock/c7-devtoolset-8.x86_64.cfg +++ b/mock/c7-devtoolset-8.x86_64.cfg @@ -1,6 +1,6 @@ config_opts['root'] = 'TARGETNAME' config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) +config_opts['legal_host_arches'] = ('x86_64','noarch') 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-build devtoolset-8-build' config_opts['dist'] = 'el7' # only useful for --resultdir variable subst