From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 9 Aug 2012 21:54:28 +0000 (+0200)
Subject: Correct 32-bit patforms.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f675af01252c17963bbf01c8f5b64f91fe679d3f;p=mock.git

Correct 32-bit patforms.
---

diff --git a/sl-5-i386.cfg.template b/sl-5-i386.cfg.template
index 31f8e1c..f40f082 100644
--- a/sl-5-i386.cfg.template
+++ b/sl-5-i386.cfg.template
@@ -1,6 +1,6 @@
 config_opts['root'] = 'sl-5-i386'
-config_opts['target_arch'] = 'i386'
-config_opts['legal_host_arches'] = ('i386',)
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386','i586','i686',)
 config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
 config_opts['dist'] = 'el5'  # only useful for --resultdir variable subst
 config_opts['macros']['%__arch_install_post'] = '%{nil}'
@@ -43,7 +43,7 @@ gpgkey=http://repository.egi.eu/sw/production/cas/1/GPG-KEY-EUGridPMA-RPM-3
 
 [EMI-2-third-party]
 name=EMI 2 Third-Party Repository
-baseurl=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/sl6/$basearch/third-party
+baseurl=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/sl5/$basearch/third-party
 gpgkey=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/RPM-GPG-KEY-emi
 protect=1
 enabled=1
diff --git a/sl-6-i386.cfg.template b/sl-6-i386.cfg.template
new file mode 100644
index 0000000..5384203
--- /dev/null
+++ b/sl-6-i386.cfg.template
@@ -0,0 +1,55 @@
+config_opts['root'] = 'sl-6-i386'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386','i586','i686',)
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
+config_opts['macros']['%__arch_install_post'] = '%{nil}'
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+logfile=/var/log/yum.log
+reposdir=/dev/null
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+
+# repos
+
+[core]
+name=SL 6 base
+baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/6x/$basearch/os
+	ftp://mirror.switch.ch/mirror/scientificlinux/6x/$basearch/os
+	ftp://ftp.scientificlinux.org/linux/scientific/6x/$basearch/os
+
+[update]
+name=SL 6 updates
+baseurl=http://scientificlinux.physik.uni-muenchen.de/mirror/scientific/6x/$basearch/updates/security
+	ftp://mirror.switch.ch/mirror/scientificlinux/6x/$basearch/updates/security
+	ftp://ftp.scientificlinux.org/linux/scientific/6x/$basearch/updates/security
+
+[extras]
+name=epel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=i386
+
+[EGI-trustanchors]
+name=EGI-trustanchors
+baseurl=http://repository.egi.eu/sw/production/cas/1/current/
+gpgkey=http://repository.egi.eu/sw/production/cas/1/GPG-KEY-EUGridPMA-RPM-3
+
+[EMI-2-third-party]
+name=EMI 2 Third-Party Repository
+baseurl=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/sl6/$basearch/third-party
+gpgkey=http://emisoft.web.cern.ch/emisoft/dist/EMI/2/RPM-GPG-KEY-emi
+protect=1
+enabled=1
+
+[main]
+[local]
+name=Local
+baseurl=file://@PWD@/@REPO@
+"""