From 3382452a17cf760a3acc7e8a367647cdfc240656 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Jul 13 2018 12:42:03 +0000 Subject: update the 6-plus and add 6-extras mock configs --- diff --git a/mock/6-extras.i386.cfg b/mock/6-extras.i386.cfg new file mode 100644 index 0000000..076f6d8 --- /dev/null +++ b/mock/6-extras.i386.cfg @@ -0,0 +1,63 @@ +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' +config_opts['dist'] = 'el6' # only useful for --resultdir variable subst +config_opts['macros']['%dist'] = ".el6" +config_opts['%centos_ver'] = "6" +config_opts['macros']['%centos_ver'] = "6" +config_opts['macros']['%rhel'] = "6" +config_opts['macros']['%el6'] = "1" +config_opts['macros']['%redhat'] = "6" +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" +config_opts['macros']['%_host'] = "i386-redhat-linux-gnu" +config_opts['macros']['%vendor'] = "CentOS" +config_opts['macros']['%packager'] = "CentOS BuildSystem " + +# no ccache in base repo +config_opts['plugin_conf']['ccache_enable'] = False +config_opts['plugin_conf']['yum_cache_enable'] = False + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +exclude=*.x86_64 + +# repos + +[all] +name=centos 6 i386 - all +baseurl=http://repohost/repo/6.all.i386/ +enabled=1 +gpgcheck=0 +cost=2000 + +[6.10-updates] +name=6.10-updates +baseurl=http://repohost/repo/6.10-updates.i386/ +enabled=1 +gpgcheck=0 +cost=1900 + +[6-extras] +name=6-extras +baseurl=http://repohost/repo/6-extras.x86_64/ +enabled=1 +gpgcheck=0 +cost=1900 + + +""" + diff --git a/mock/6-extras.x86_64.cfg b/mock/6-extras.x86_64.cfg new file mode 100644 index 0000000..bfce35b --- /dev/null +++ b/mock/6-extras.x86_64.cfg @@ -0,0 +1,62 @@ +config_opts['root'] = 'TARGETNAME' +config_opts['target_arch'] = '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' +config_opts['dist'] = 'el6' # only useful for --resultdir variable subst +config_opts['macros']['%dist'] = ".el6" +config_opts['%centos_ver'] = "6" +config_opts['macros']['%centos_ver'] = "6" +config_opts['macros']['%rhel'] = "6" +config_opts['macros']['%el6'] = "1" +config_opts['macros']['%redhat'] = "6" +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" +config_opts['macros']['%_host'] = "x86_64-redhat-linux-gnu" +config_opts['macros']['%vendor'] = "CentOS" +config_opts['macros']['%packager'] = "CentOS BuildSystem " + +# no ccache in base repo +config_opts['plugin_conf']['ccache_enable'] = False +config_opts['plugin_conf']['yum_cache_enable'] = False + +config_opts['yum.conf'] = """ +[main] +cachedir=/var/cache/yum +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos + +[all] +name=centos 6 x86_64 - all +baseurl=http://repohost/repo/6.all.x86_64/ +enabled=1 +gpgcheck=0 +cost=2000 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 glibc-static.i686 + +[6.10-updates] +name=6.10-updates +baseurl=http://repohost/repo/6.10-updates.x86_64/ +enabled=1 +gpgcheck=0 +cost=1900 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 glibc-static.i686 + +[6-extras] +name=6-extras +baseurl=http://repohost/repo/6-extras.x86_64/ +enabled=1 +gpgcheck=0 +cost=1900 +includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 glibc-static.i686 +""" + diff --git a/mock/6-plus.i386.cfg b/mock/6-plus.i386.cfg index e3c8659..eb34e5a 100644 --- a/mock/6-plus.i386.cfg +++ b/mock/6-plus.i386.cfg @@ -44,9 +44,9 @@ enabled=1 gpgcheck=0 cost=2000 -[6.10] -name=6.10 -baseurl=http://repohost/repo/6.10.i386/ +[6.10-updates] +name=6.10-updates +baseurl=http://repohost/repo/6.10-updates.i386/ enabled=1 gpgcheck=0 cost=1900 diff --git a/mock/6-plus.x86_64.cfg b/mock/6-plus.x86_64.cfg index 5ffcf29..939060f 100644 --- a/mock/6-plus.x86_64.cfg +++ b/mock/6-plus.x86_64.cfg @@ -43,9 +43,9 @@ gpgcheck=0 cost=2000 includepkgs=*.x86_64 *.noarch glibc.i686 glibc-devel.i686 nss-softokn-freebl*.i686 glibc-static.i686 -[6.10] -name=6.10 -baseurl=http://repohost/repo/6.10.x86_64/ +[6.10-updates] +name=6.10-updates +baseurl=http://repohost/repo/6.10-updates.x86_64/ enabled=1 gpgcheck=0 cost=1900