clean out things that are now in 'defaults.cfg'

15 files changed, 4 insertions, 225 deletions

diff --git a/etc/fedora-1-i386-core.cfg b/etc/fedora-1-i386-core.cfg
index 85c9d7d..99be9ab 100644
--- a/etc/fedora-1-i386-core.cfg
+++ b/etc/fedora-1-i386-core.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'fedora-1-i386-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/bin/su'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'
 
 
diff --git a/etc/fedora-2-i386-core.cfg b/etc/fedora-2-i386-core.cfg
index 009c088..54122a4 100644
--- a/etc/fedora-2-i386-core.cfg
+++ b/etc/fedora-2-i386-core.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'fedora-2-i386-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/bin/su'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'
 
 
diff --git a/etc/fedora-3-i386-core.cfg b/etc/fedora-3-i386-core.cfg
index 929cd98..2dbea3d 100644
--- a/etc/fedora-3-i386-core.cfg
+++ b/etc/fedora-3-i386-core.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'fedora-3-i386-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'
 
 
diff --git a/etc/fedora-3-x86_64-core.cfg b/etc/fedora-3-x86_64-core.cfg
index d26fcf7..ccbcbb0 100644
--- a/etc/fedora-3-x86_64-core.cfg
+++ b/etc/fedora-3-x86_64-core.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'fedora-3-x86_64-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'x86_64'
 
 
@@ -30,6 +15,7 @@ obsoletes=1
 gpgcheck=0
 assumeyes=1
 exclude=*.i386 *.i686 *.athlon *.i586 *.486
+includepkgs=glibc.i686
 
 # repos
 
diff --git a/etc/fedora-4-i386-core.cfg b/etc/fedora-4-i386-core.cfg
index 8e19e85..dc63c30 100644
--- a/etc/fedora-4-i386-core.cfg
+++ b/etc/fedora-4-i386-core.cfg
@@ -2,21 +2,6 @@
 
 import os
 config_opts['root'] = 'fedora-4-i386-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'
 
 
diff --git a/etc/fedora-4-ppc-core.cfg b/etc/fedora-4-ppc-core.cfg
index bb6c9ed..21120b1 100644
--- a/etc/fedora-4-ppc-core.cfg
+++ b/etc/fedora-4-ppc-core.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'fedora-4-ppc-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'ppc'
 
 
diff --git a/etc/fedora-4-x86_64-core.cfg b/etc/fedora-4-x86_64-core.cfg
index 00987a2..fea562a 100644
--- a/etc/fedora-4-x86_64-core.cfg
+++ b/etc/fedora-4-x86_64-core.cfg
@@ -2,21 +2,6 @@
 import os
 
 config_opts['root'] = 'fedora-4-x86_64-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'x86_64'
 
 
@@ -31,6 +16,7 @@ obsoletes=1
 gpgcheck=0
 assumeyes=1
 exclude=*.i386 *.486 *.586 *.i686 *.athlon
+includepkgs=glibc.i686
 
 # repos
 
diff --git a/etc/fedora-5-i386-core.cfg b/etc/fedora-5-i386-core.cfg
index 120902e..8baf643 100644
--- a/etc/fedora-5-i386-core.cfg
+++ b/etc/fedora-5-i386-core.cfg
@@ -2,21 +2,6 @@
 
 import os
 config_opts['root'] = 'fedora-5-i386-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'
 
 
diff --git a/etc/fedora-5-ppc-core.cfg b/etc/fedora-5-ppc-core.cfg
index 91aa48e..61ba6ef 100644
--- a/etc/fedora-5-ppc-core.cfg
+++ b/etc/fedora-5-ppc-core.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'fedora-5-ppc-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'ppc'
 
 
diff --git a/etc/fedora-5-x86_64-core.cfg b/etc/fedora-5-x86_64-core.cfg
index 116cb34..fe8a9c3 100644
--- a/etc/fedora-5-x86_64-core.cfg
+++ b/etc/fedora-5-x86_64-core.cfg
@@ -2,21 +2,6 @@
 import os
 
 config_opts['root'] = 'fedora-5-x86_64-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'x86_64'
 
 
@@ -31,6 +16,7 @@ obsoletes=1
 gpgcheck=0
 assumeyes=1
 exclude=*.i386 *.486 *.586 *.i686 *.athlon
+includepkgs=glibc.i686
 
 # repos
 
diff --git a/etc/fedora-devel-i386-core.cfg b/etc/fedora-devel-i386-core.cfg
index da84b4b..a3f6ca7 100644
--- a/etc/fedora-devel-i386-core.cfg
+++ b/etc/fedora-devel-i386-core.cfg
@@ -2,21 +2,6 @@
 
 import os
 config_opts['root'] = 'fedora-development-i386-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'
 
 
diff --git a/etc/fedora-devel-ppc-core.cfg b/etc/fedora-devel-ppc-core.cfg
index 1bd0e94..2033775 100644
--- a/etc/fedora-devel-ppc-core.cfg
+++ b/etc/fedora-devel-ppc-core.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'fedora-development-ppc-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'ppc'
 
 
diff --git a/etc/fedora-devel-x86_64-core.cfg b/etc/fedora-devel-x86_64-core.cfg
index 4b22a1d..cf4f937 100644
--- a/etc/fedora-devel-x86_64-core.cfg
+++ b/etc/fedora-devel-x86_64-core.cfg
@@ -2,21 +2,6 @@
 import os
 
 config_opts['root'] = 'fedora-development-x86_64-core'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/sbin/runuser'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'x86_64'
 
 
@@ -31,6 +16,7 @@ obsoletes=1
 gpgcheck=0
 assumeyes=1
 exclude=*.i386 *.486 *.586 *.i686 *.athlon
+includepkgs=glibc.i686
 
 # repos
 
diff --git a/etc/redhat-73-i386.cfg b/etc/redhat-73-i386.cfg
index 479d9a4..3f1514f 100644
--- a/etc/redhat-73-i386.cfg
+++ b/etc/redhat-73-i386.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'redhat-73-i386'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/bin/su'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'
 
 
diff --git a/etc/redhat-9-i386.cfg b/etc/redhat-9-i386.cfg
index 7f80a25..5c043fa 100644
--- a/etc/redhat-9-i386.cfg
+++ b/etc/redhat-9-i386.cfg
@@ -1,21 +1,6 @@
 #!/usr/bin/python -tt
 import os
 config_opts['root'] = 'redhat-9-i386'
-config_opts['basedir'] = '/var/lib/mock/'
-config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
-config_opts['mount'] = '/usr/sbin/mock-helper mount'
-config_opts['umount'] = '/usr/sbin/mock-helper umount'
-config_opts['rm'] = '/usr/sbin/mock-helper rm'
-config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
-config_opts['yum'] = '/usr/sbin/mock-helper yum'
-config_opts['runuser'] = '/bin/su'
-config_opts['chroot_dep_package'] = 'buildsys-build'
-config_opts['chrootuser'] = 'mockbuild'
-config_opts['chrootgroup'] = 'mockbuild'
-config_opts['chrootuid'] = os.geteuid()
-config_opts['chrootgid'] = os.getegid()
-config_opts['chroothome'] = '/builddir'
-config_opts['clean'] = True
 config_opts['target_arch'] = 'i386'