From 7801984a38396b5abcaa91f431d935d3499bec41 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Mar 19 2019 17:22:26 +0000 Subject: fix valgrind --- diff --git a/mock/valgrind-3.9.0-1.2.el7-x86_64.cfg b/mock/valgrind-3.9.0-1.2.el7-x86_64.cfg index 9a613b5..69ec2b1 100644 --- a/mock/valgrind-3.9.0-1.2.el7-x86_64.cfg +++ b/mock/valgrind-3.9.0-1.2.el7-x86_64.cfg @@ -1,8 +1,8 @@ -config_opts['root'] = 'TARGETNAME' -config_opts['basedir'] = '/var/lib/mock' -config_opts['target_arch'] = 'ppc64le' -config_opts['legal_host_arches'] = ('ppc64le', '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 vim-minimal which xz' +config_opts['root'] = 'rhel-7b1-x86_64' +config_opts['basedir'] = 'MOCKROOT' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('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" @@ -14,9 +14,8 @@ 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['plugin_conf']['ccache_enable'] = False config_opts['yum.conf'] = """ [main] @@ -30,42 +29,25 @@ gpgcheck=0 assumeyes=1 syslog_ident=mock syslog_device= -exclude=*4.8.5-36.el7_6.1* *2.23.2-59.el7_6.1* *1.0.3-5.el7_6.1* *4.1.5.1-25.el7_6.1* *3.10.0-957.10.1.el7* kernel*-4.* -# repos -[c7.1708.u.ppc64le] -name=c7.1708.u.ppc64le -baseurl=http://repohost/repo/c7.1708.u.ppc64le/ -gpgcheck=0 -cost=1900 - -[c7.1708.00.ppc64le] -name=c7.1708.00.ppc64le -baseurl=http://repohost/repo/c7.1708.00.ppc64le/ -gpgcheck=0 -cost=1700 -[c7.1804.00.ppc64le] -name=c7.1804.00.ppc64le -baseurl=http://repohost/repo/c7.1804.00.ppc64le/ -gpgcheck=0 -cost=1700 +#exclude=*.i?86 -[c7.1804.u.ppc64le] -name=c7.1804.u.ppc64le -baseurl=http://repohost/repo/c7.1804.u.ppc64le/ -gpgcheck=0 -cost=1600 - -[c7.1810.00.ppc64le] -name=c7.1810.00.ppc64le -baseurl=http://repohost/repo/c7.1810.00.ppc64le/ -gpgcheck=0 -cost=1700 +# repos +[base] +name=BaseOS +enabled=1 +baseurl=http://repohost/tmp/mirror/r7b1/ +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 + +[r7b1] +name=r7b1 +enabled=1 +baseurl=http://repohost/tmp/repo/r7b1/ + +[f19] +name=f19 +enabled=1 +baseurl=http://repohost/tmp/mirror/f19-x86_64/ +includepkgs=gcc-java libgcj -[c7.1810.u.ppc64le] -name=c7.1810.u.ppc64le -baseurl=http://repohost/repo/c7.1810.u.ppc64le/ -gpgcheck=0 -cost=1600 """ -