initial merge of mock-0-6-branch into HEAD

14 files changed, 225 insertions, 37 deletions

diff --git a/etc/defaults.cfg b/etc/defaults.cfg
index 878b4a1..993ff6d 100644
--- a/etc/defaults.cfg
+++ b/etc/defaults.cfg
@@ -12,6 +12,9 @@ config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chroothome'] = '/builddir'
 config_opts['clean'] = True
 
+# copy the host resolv.conf to the chroot
+config_opts['use_host_resolv'] = True
+
 # caching related options
 config_opts['rebuild_cache'] = True
 config_opts['use_cache'] = True
diff --git a/etc/fedora-1-i386-core.cfg b/etc/fedora-1-i386-core.cfg
index 903c383..7f1f15b 100644
--- a/etc/fedora-1-i386-core.cfg
+++ b/etc/fedora-1-i386-core.cfg
@@ -3,8 +3,9 @@ import os
 config_opts['root'] = 'fedora-1-i386-core'
 config_opts['target_arch'] = 'i386'
 config_opts['runuser'] = '/bin/su'
-config_opts['yum.conf'] = """
 
+
+config_opts['yum.conf'] = """
 [main]
 cachedir=/var/cache/yum
 debuglevel=1
diff --git a/etc/fedora-4-i386-epel.cfg b/etc/fedora-4-i386-epel.cfg
index 2a5b17a..398acc3 100644
--- a/etc/fedora-4-i386-epel.cfg
+++ b/etc/fedora-4-i386-epel.cfg
@@ -5,7 +5,7 @@ config_opts['target_arch'] = 'i386'
 
 config_opts['yum.conf'] = """
 [main]
-cachdir=/var/cache/yum
+cachedir=/var/cache/yum
 debuglevel=1
 logfile=/var/log/yum.log
 reposdir=/dev/null
@@ -18,11 +18,11 @@ assumeyes=1
 
 [core]
 name=base
-mirrorlist=http://mirror.centos.org/?release=4&arch=i386&repo=os
+mirrorlist=http://mirrorlist.centos.org/?release=4&arch=i386&repo=os
 
 [update]
 name=updates
-mirrorlist=http://mirror.centos.org/?release=4&arch=i386&repo=updates
+mirrorlist=http://mirrorlist.centos.org/?release=4&arch=i386&repo=updates
 
 [groups]
 name=groups
diff --git a/etc/fedora-4-ppc-epel.cfg b/etc/fedora-4-ppc-epel.cfg
index d273a51..de52211 100644
--- a/etc/fedora-4-ppc-epel.cfg
+++ b/etc/fedora-4-ppc-epel.cfg
@@ -5,7 +5,7 @@ config_opts['target_arch'] = 'ppc'
 
 config_opts['yum.conf'] = """
 [main]
-cachdir=/var/cache/yum
+cachedir=/var/cache/yum
 debuglevel=1
 logfile=/var/log/yum.log
 reposdir=/dev/null
@@ -18,11 +18,11 @@ assumeyes=1
 
 [core]
 name=base
-mirrorlist=http://mirror.centos.org/?release=4&arch=ppc&repo=os
+mirrorlist=http://mirrorlist.centos.org/?release=4&arch=ppc&repo=os
 
 [update]
 name=updates
-mirrorlist=http://mirror.centos.org/?release=4&arch=ppc&repo=updates
+mirrorlist=http://mirrorlist.centos.org/?release=4&arch=ppc&repo=updates
 
 [groups]
 name=groups
diff --git a/etc/fedora-4-x86_64-epel.cfg b/etc/fedora-4-x86_64-epel.cfg
index 03ad3ee..f1c9868 100644
--- a/etc/fedora-4-x86_64-epel.cfg
+++ b/etc/fedora-4-x86_64-epel.cfg
@@ -5,7 +5,7 @@ config_opts['target_arch'] = 'x86_64'
 
 config_opts['yum.conf'] = """
 [main]
-cachdir=/var/cache/yum
+cachedir=/var/cache/yum
 debuglevel=1
 logfile=/var/log/yum.log
 reposdir=/dev/null
@@ -18,11 +18,11 @@ assumeyes=1
 
 [core]
 name=base
-mirrorlist=http://mirror.centos.org/?release=4&arch=x86_64&repo=os
+mirrorlist=http://mirrorlist.centos.org/?release=4&arch=x86_64&repo=os
 
 [update]
 name=updates
-mirrorlist=http://mirror.centos.org/?release=4&arch=x86_64&repo=updates
+mirrorlist=http://mirrorlist.centos.org/?release=4&arch=x86_64&repo=updates
 
 [groups]
 name=groups
diff --git a/etc/fedora-7-i386.cfg b/etc/fedora-7-i386.cfg
new file mode 100644
index 0000000..8ac9a11
--- /dev/null
+++ b/etc/fedora-7-i386.cfg
@@ -0,0 +1,40 @@
+#!/usr/bin/python -tt
+
+import os
+config_opts['root'] = 'fedora-7-i386'
+config_opts['target_arch'] = 'i386'
+
+
+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
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-7&arch=i386
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f7&arch=i386
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/7/i386/
+
+[local]
+name=local
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc7-build-current/i386/
+exclude=*debuginfo*
+"""
+
+
+
diff --git a/etc/fedora-7-ppc.cfg b/etc/fedora-7-ppc.cfg
new file mode 100644
index 0000000..27458e3
--- /dev/null
+++ b/etc/fedora-7-ppc.cfg
@@ -0,0 +1,40 @@
+#!/usr/bin/python -tt
+import os
+config_opts['root'] = 'fedora-7-ppc'
+config_opts['target_arch'] = 'ppc'
+
+
+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
+exclude=*.ppc64
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-7&arch=ppc
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f7&arch=ppc
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/7/ppc/
+
+[local]
+name=local
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc7-build-current/ppc/
+exclude=*debuginfo*
+"""
+
+
+
diff --git a/etc/fedora-7-ppc64.cfg b/etc/fedora-7-ppc64.cfg
new file mode 100644
index 0000000..606ef94
--- /dev/null
+++ b/etc/fedora-7-ppc64.cfg
@@ -0,0 +1,39 @@
+#!/usr/bin/python -tt
+import os
+config_opts['root'] = 'fedora-7-ppc64'
+config_opts['target_arch'] = 'ppc64'
+
+
+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
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-7&arch=ppc64
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f7&arch=ppc64
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/7/ppc64/
+
+[local]
+name=local
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc7-build-current/ppc64/
+exclude=*debuginfo*
+"""
+
+
+
diff --git a/etc/fedora-7-x86_64.cfg b/etc/fedora-7-x86_64.cfg
new file mode 100644
index 0000000..1beb868
--- /dev/null
+++ b/etc/fedora-7-x86_64.cfg
@@ -0,0 +1,41 @@
+#!/usr/bin/python -tt
+import os
+
+config_opts['root'] = 'fedora-7-x86_64'
+config_opts['target_arch'] = 'x86_64'
+
+
+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
+exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghijkmnopqrstuvwxyz]*.i?86 glib2.i?86 glib.i?86 *-devel.i?86
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-7&arch=x86_64
+
+[updates-released]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f7&arch=x86_64
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/7/x86_64/
+
+[local]
+name=local
+baseurl=http://koji.fedoraproject.org/static-repos/dist-fc7-build-current/x86_64/
+exclude=*debuginfo*
+"""
+
+
+
diff --git a/etc/fedora-devel-i386-core.cfg b/etc/fedora-devel-i386.cfg
index bc699b0..0e8348a 100644
--- a/etc/fedora-devel-i386-core.cfg
+++ b/etc/fedora-devel-i386.cfg
@@ -1,7 +1,7 @@
 #!/usr/bin/python -tt
 
 import os
-config_opts['root'] = 'fedora-development-i386-core'
+config_opts['root'] = 'fedora-development-i386'
 config_opts['target_arch'] = 'i386'
 
 
@@ -18,22 +18,18 @@ assumeyes=1
 
 # repos
 
-[core]
-name=core
+[fedora]
+name=fedora
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
 
 [groups]
 name=groups
 baseurl=http://buildsys.fedoraproject.org/buildgroups/development/i386/
 
-[extras]
-name=extras
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386
-
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-development-extras/
-exclude=*.x86_64 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-f8-build-current/i386
+exclude=*debuginfo*
 """
 
 
diff --git a/etc/fedora-devel-ppc-core.cfg b/etc/fedora-devel-ppc.cfg
index 0cf19fc..4827b9c 100644
--- a/etc/fedora-devel-ppc-core.cfg
+++ b/etc/fedora-devel-ppc.cfg
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 import os
-config_opts['root'] = 'fedora-development-ppc-core'
+config_opts['root'] = 'fedora-development-ppc'
 config_opts['target_arch'] = 'ppc'
 
 
@@ -18,22 +18,18 @@ exclude=*.ppc64
 
 # repos
 
-[core]
-name=core
+[fedora]
+name=fedora
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc
 
 [groups]
 name=groups
 baseurl=http://buildsys.fedoraproject.org/buildgroups/development/ppc/
 
-[extras]
-name=extras
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc
-
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-development-extras/
-exclude=*.i386 *.x86_64
+baseurl=http://koji.fedoraproject.org/static-repos/dist-f8-build-current/ppc/
+exclude=*debuginfo*
 """
 
 
diff --git a/etc/fedora-devel-ppc64.cfg b/etc/fedora-devel-ppc64.cfg
new file mode 100644
index 0000000..bcbb16d
--- /dev/null
+++ b/etc/fedora-devel-ppc64.cfg
@@ -0,0 +1,35 @@
+#!/usr/bin/python -tt
+import os
+config_opts['root'] = 'fedora-development-ppc64'
+config_opts['target_arch'] = 'ppc64'
+
+
+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
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc64
+
+[groups]
+name=groups
+baseurl=http://buildsys.fedoraproject.org/buildgroups/development/ppc64/
+
+[local]
+name=local
+baseurl=http://koji.fedoraproject.org/static-repos/dist-f8-build-current/ppc64/
+exclude=*debuginfo*
+"""
+
+
+
diff --git a/etc/fedora-devel-x86_64-core.cfg b/etc/fedora-devel-x86_64.cfg
index fdcb34f..e145772 100644
--- a/etc/fedora-devel-x86_64-core.cfg
+++ b/etc/fedora-devel-x86_64.cfg
@@ -1,7 +1,7 @@
 #!/usr/bin/python -tt
 import os
 
-config_opts['root'] = 'fedora-development-x86_64-core'
+config_opts['root'] = 'fedora-development-x86_64'
 config_opts['target_arch'] = 'x86_64'
 
 
@@ -19,22 +19,18 @@ exclude=[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefhijklmnopqrstuvwxyz]*.i*86 g[abcdefghij
 
 # repos
 
-[core]
-name=core
+[fedora]
+name=fedora
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
 
 [groups]
 name=groups
 baseurl=http://buildsys.fedoraproject.org/buildgroups/development/x86_64/
 
-[extras]
-name=extras
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64
-
 [local]
 name=local
-baseurl=http://buildsys.fedoraproject.org/plague-results/fedora-development-extras/
-exclude=*.i386 *.ppc
+baseurl=http://koji.fedoraproject.org/static-repos/dist-f8-build-current/x86_64/
+exclude=*debuginfo*
 """
 
 
diff --git a/etc/redhat-8-i386.cfg b/etc/redhat-8-i386.cfg
index a217588..f04ed7c 100644
--- a/etc/redhat-8-i386.cfg
+++ b/etc/redhat-8-i386.cfg
@@ -2,6 +2,7 @@
 import os
 config_opts['root'] = 'redhat-8-i386'
 config_opts['target_arch'] = 'i386'
+config_opts['runuser'] = '/bin/su'
 
 
 config_opts['yum.conf'] = """