Attachment 854608 Details for Bug 1056039 – Final patch, which fix this issue.

[patch] Final patch, which fix this issue.

0001-1056039-pass-releasever-to-yum.patch (text/plain), 22.91 KB, created by Miroslav Suchý on 2014-01-23 21:37:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Suchý

Created: 2014-01-23 21:37:52 UTC

Size: 22.91 KB

patch

obsolete

>From 6c24951e30fe431a58f37974e4040e19dedb32f3 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <miroslav@suchy.cz>
>Date: Wed, 22 Jan 2014 23:51:24 +0100
>Subject: [PATCH] 1056039 - pass releasever to yum
>
>---
> etc/mock/epel-5-i386.cfg            | 2 ++
> etc/mock/epel-5-ppc.cfg             | 2 ++
> etc/mock/epel-5-x86_64.cfg          | 2 ++
> etc/mock/epel-6-i386.cfg            | 2 ++
> etc/mock/epel-6-ppc64.cfg           | 2 ++
> etc/mock/epel-6-x86_64.cfg          | 2 ++
> etc/mock/fedora-18-arm.cfg          | 1 +
> etc/mock/fedora-18-armhfp.cfg       | 1 +
> etc/mock/fedora-18-i386.cfg         | 1 +
> etc/mock/fedora-18-ppc.cfg          | 1 +
> etc/mock/fedora-18-ppc64.cfg        | 1 +
> etc/mock/fedora-18-s390.cfg         | 1 +
> etc/mock/fedora-18-s390x.cfg        | 1 +
> etc/mock/fedora-18-x86_64.cfg       | 1 +
> etc/mock/fedora-19-armhfp.cfg       | 1 +
> etc/mock/fedora-19-i386.cfg         | 1 +
> etc/mock/fedora-19-ppc.cfg          | 1 +
> etc/mock/fedora-19-ppc64.cfg        | 1 +
> etc/mock/fedora-19-s390.cfg         | 1 +
> etc/mock/fedora-19-s390x.cfg        | 1 +
> etc/mock/fedora-19-x86_64.cfg       | 1 +
> etc/mock/fedora-20-armhfp.cfg       | 1 +
> etc/mock/fedora-20-i386.cfg         | 1 +
> etc/mock/fedora-20-ppc.cfg          | 1 +
> etc/mock/fedora-20-ppc64.cfg        | 1 +
> etc/mock/fedora-20-s390.cfg         | 1 +
> etc/mock/fedora-20-s390x.cfg        | 1 +
> etc/mock/fedora-20-x86_64.cfg       | 1 +
> etc/mock/fedora-rawhide-arm.cfg     | 1 +
> etc/mock/fedora-rawhide-armhfp.cfg  | 1 +
> etc/mock/fedora-rawhide-i386.cfg    | 1 +
> etc/mock/fedora-rawhide-ppc.cfg     | 1 +
> etc/mock/fedora-rawhide-ppc64.cfg   | 1 +
> etc/mock/fedora-rawhide-s390.cfg    | 1 +
> etc/mock/fedora-rawhide-s390x.cfg   | 1 +
> etc/mock/fedora-rawhide-sparc.cfg   | 1 +
> etc/mock/fedora-rawhide-sparc64.cfg | 1 +
> etc/mock/fedora-rawhide-x86_64.cfg  | 1 +
> etc/mock/site-defaults.cfg          | 1 +
> py/mockbuild/backend.py             | 3 +++
> py/mockbuild/util.py                | 1 +
> 41 files changed, 49 insertions(+)
>
>diff --git a/etc/mock/epel-5-i386.cfg b/etc/mock/epel-5-i386.cfg
>index a8b03ed..b9390c3 100644
>--- a/etc/mock/epel-5-i386.cfg
>+++ b/etc/mock/epel-5-i386.cfg
>@@ -5,6 +5,8 @@ config_opts['chroot_setup_cmd'] = 'install buildsys-build'
> config_opts['dist'] = 'el5'  # only useful for --resultdir variable subst
> if not config_opts.has_key('macros'):  config_opts['macros'] = {}
> config_opts['macros']['%__arch_install_post'] = '%{nil}'
>+# beware: RHEL use 5Server or 5Client
>+config_opts['releasever'] = '5'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/epel-5-ppc.cfg b/etc/mock/epel-5-ppc.cfg
>index 095a116..55b33e9 100644
>--- a/etc/mock/epel-5-ppc.cfg
>+++ b/etc/mock/epel-5-ppc.cfg
>@@ -5,6 +5,8 @@ config_opts['chroot_setup_cmd'] = 'install buildsys-build'
> config_opts['dist'] = 'el5'  # only useful for --resultdir variable subst
> if not config_opts.has_key('macros'):  config_opts['macros'] = {}
> config_opts['macros']['%__arch_install_post'] = '%{nil}'
>+# beware: RHEL use 5Server or 5Client
>+config_opts['releasever'] = '5'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/epel-5-x86_64.cfg b/etc/mock/epel-5-x86_64.cfg
>index 0f59da5..8abc5a4 100644
>--- a/etc/mock/epel-5-x86_64.cfg
>+++ b/etc/mock/epel-5-x86_64.cfg
>@@ -5,6 +5,8 @@ config_opts['chroot_setup_cmd'] = 'install buildsys-build'
> config_opts['dist'] = 'el5'  # only useful for --resultdir variable subst
> if not config_opts.has_key('macros'):  config_opts['macros'] = {}
> config_opts['macros']['%__arch_install_post'] = '%{nil}'
>+# beware: RHEL use 5Server or 5Client
>+config_opts['releasever'] = '5'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/epel-6-i386.cfg b/etc/mock/epel-6-i386.cfg
>index 3427245..27f86cc 100644
>--- a/etc/mock/epel-6-i386.cfg
>+++ b/etc/mock/epel-6-i386.cfg
>@@ -3,6 +3,8 @@ config_opts['target_arch'] = 'i686'
> config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
>+# beware: RHEL use 6Server or 6Client
>+config_opts['releasever'] = '6'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/epel-6-ppc64.cfg b/etc/mock/epel-6-ppc64.cfg
>index 89d58bd..a813da7 100644
>--- a/etc/mock/epel-6-ppc64.cfg
>+++ b/etc/mock/epel-6-ppc64.cfg
>@@ -3,6 +3,8 @@ config_opts['target_arch'] = 'ppc64'
> config_opts['legal_host_arches'] = ('ppc64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
>+# beware: RHEL use 6Server or 6Client
>+config_opts['releasever'] = '6'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/epel-6-x86_64.cfg b/etc/mock/epel-6-x86_64.cfg
>index 6f18181..b9b63d3 100644
>--- a/etc/mock/epel-6-x86_64.cfg
>+++ b/etc/mock/epel-6-x86_64.cfg
>@@ -3,6 +3,8 @@ config_opts['target_arch'] = 'x86_64'
> config_opts['legal_host_arches'] = ('x86_64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'el6'  # only useful for --resultdir variable subst
>+# beware RHEL use 6Server or 6Client
>+config_opts['releasever'] = '6'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-arm.cfg b/etc/mock/fedora-18-arm.cfg
>index 3d6b104..e2860e6 100644
>--- a/etc/mock/fedora-18-arm.cfg
>+++ b/etc/mock/fedora-18-arm.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'armv5tel'
> config_opts['legal_host_arches'] = ('armv5tel', 'armv6l', 'armv7l')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-armhfp.cfg b/etc/mock/fedora-18-armhfp.cfg
>index f27ca37..ba10f45 100644
>--- a/etc/mock/fedora-18-armhfp.cfg
>+++ b/etc/mock/fedora-18-armhfp.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'armv7hl'
> config_opts['legal_host_arches'] = ('armv7l')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-i386.cfg b/etc/mock/fedora-18-i386.cfg
>index daa08f8..f5c569b 100644
>--- a/etc/mock/fedora-18-i386.cfg
>+++ b/etc/mock/fedora-18-i386.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'i686'
> config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-ppc.cfg b/etc/mock/fedora-18-ppc.cfg
>index d2d4db9..4fde0e5 100644
>--- a/etc/mock/fedora-18-ppc.cfg
>+++ b/etc/mock/fedora-18-ppc.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc'
> config_opts['legal_host_arches'] = ('ppc', 'ppc64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-ppc64.cfg b/etc/mock/fedora-18-ppc64.cfg
>index be0464d..9dfa1c1 100644
>--- a/etc/mock/fedora-18-ppc64.cfg
>+++ b/etc/mock/fedora-18-ppc64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc64'
> config_opts['legal_host_arches'] = ('ppc64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-s390.cfg b/etc/mock/fedora-18-s390.cfg
>index 12418b8..365b39c 100644
>--- a/etc/mock/fedora-18-s390.cfg
>+++ b/etc/mock/fedora-18-s390.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390'
> config_opts['legal_host_arches'] = ('s390x', 's390')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-s390x.cfg b/etc/mock/fedora-18-s390x.cfg
>index 15f9388..7f1a3ab 100644
>--- a/etc/mock/fedora-18-s390x.cfg
>+++ b/etc/mock/fedora-18-s390x.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390x'
> config_opts['legal_host_arches'] = ('s390x',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-18-x86_64.cfg b/etc/mock/fedora-18-x86_64.cfg
>index e85cf57..3375ef5 100644
>--- a/etc/mock/fedora-18-x86_64.cfg
>+++ b/etc/mock/fedora-18-x86_64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'x86_64'
> config_opts['legal_host_arches'] = ('x86_64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc18'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '18'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-19-armhfp.cfg b/etc/mock/fedora-19-armhfp.cfg
>index e23f9a8..4c40e69 100644
>--- a/etc/mock/fedora-19-armhfp.cfg
>+++ b/etc/mock/fedora-19-armhfp.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'armv7hl'
> config_opts['legal_host_arches'] = ('armv7l')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '19'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-19-i386.cfg b/etc/mock/fedora-19-i386.cfg
>index 6d1dbd2..a6df015 100644
>--- a/etc/mock/fedora-19-i386.cfg
>+++ b/etc/mock/fedora-19-i386.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'i686'
> config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '19'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-19-ppc.cfg b/etc/mock/fedora-19-ppc.cfg
>index 15982ed..8493e9c 100644
>--- a/etc/mock/fedora-19-ppc.cfg
>+++ b/etc/mock/fedora-19-ppc.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc'
> config_opts['legal_host_arches'] = ('ppc', 'ppc64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '19'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-19-ppc64.cfg b/etc/mock/fedora-19-ppc64.cfg
>index fc938e3..68181f8 100644
>--- a/etc/mock/fedora-19-ppc64.cfg
>+++ b/etc/mock/fedora-19-ppc64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc64'
> config_opts['legal_host_arches'] = ('ppc64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '19'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-19-s390.cfg b/etc/mock/fedora-19-s390.cfg
>index 3ba1b6e..403c08e 100644
>--- a/etc/mock/fedora-19-s390.cfg
>+++ b/etc/mock/fedora-19-s390.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390'
> config_opts['legal_host_arches'] = ('s390x', 's390')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '19'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-19-s390x.cfg b/etc/mock/fedora-19-s390x.cfg
>index e497a5e..32cf30c 100644
>--- a/etc/mock/fedora-19-s390x.cfg
>+++ b/etc/mock/fedora-19-s390x.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390x'
> config_opts['legal_host_arches'] = ('s390x',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '19'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-19-x86_64.cfg b/etc/mock/fedora-19-x86_64.cfg
>index 7845563..62cfb7e 100644
>--- a/etc/mock/fedora-19-x86_64.cfg
>+++ b/etc/mock/fedora-19-x86_64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'x86_64'
> config_opts['legal_host_arches'] = ('x86_64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc19'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '19'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-20-armhfp.cfg b/etc/mock/fedora-20-armhfp.cfg
>index a7546e7..7bde3fb 100644
>--- a/etc/mock/fedora-20-armhfp.cfg
>+++ b/etc/mock/fedora-20-armhfp.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'armv7hl'
> config_opts['legal_host_arches'] = ('armv7l')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '20'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-20-i386.cfg b/etc/mock/fedora-20-i386.cfg
>index d04d180..fde3c27 100644
>--- a/etc/mock/fedora-20-i386.cfg
>+++ b/etc/mock/fedora-20-i386.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'i686'
> config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '20'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-20-ppc.cfg b/etc/mock/fedora-20-ppc.cfg
>index 4cb5b77..403611d 100644
>--- a/etc/mock/fedora-20-ppc.cfg
>+++ b/etc/mock/fedora-20-ppc.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc'
> config_opts['legal_host_arches'] = ('ppc', 'ppc64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '20'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-20-ppc64.cfg b/etc/mock/fedora-20-ppc64.cfg
>index f69988f..5bcccd1 100644
>--- a/etc/mock/fedora-20-ppc64.cfg
>+++ b/etc/mock/fedora-20-ppc64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc64'
> config_opts['legal_host_arches'] = ('ppc64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '20'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-20-s390.cfg b/etc/mock/fedora-20-s390.cfg
>index dab02fa..716ebc0 100644
>--- a/etc/mock/fedora-20-s390.cfg
>+++ b/etc/mock/fedora-20-s390.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390'
> config_opts['legal_host_arches'] = ('s390x', 's390')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '20'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-20-s390x.cfg b/etc/mock/fedora-20-s390x.cfg
>index d52ca7c..6434998 100644
>--- a/etc/mock/fedora-20-s390x.cfg
>+++ b/etc/mock/fedora-20-s390x.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390x'
> config_opts['legal_host_arches'] = ('s390x',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '20'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-20-x86_64.cfg b/etc/mock/fedora-20-x86_64.cfg
>index 0f56311..fa7f6d4 100644
>--- a/etc/mock/fedora-20-x86_64.cfg
>+++ b/etc/mock/fedora-20-x86_64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'x86_64'
> config_opts['legal_host_arches'] = ('x86_64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'fc20'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '20'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-arm.cfg b/etc/mock/fedora-rawhide-arm.cfg
>index 2753243..0f95f28 100644
>--- a/etc/mock/fedora-rawhide-arm.cfg
>+++ b/etc/mock/fedora-rawhide-arm.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'armv5tel'
> config_opts['legal_host_arches'] = ('armv5tel', 'armv6l', 'armv7l')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-armhfp.cfg b/etc/mock/fedora-rawhide-armhfp.cfg
>index a9fb736..9fcdbb8 100644
>--- a/etc/mock/fedora-rawhide-armhfp.cfg
>+++ b/etc/mock/fedora-rawhide-armhfp.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'armv7hl'
> config_opts['legal_host_arches'] = ('armv7l')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-i386.cfg b/etc/mock/fedora-rawhide-i386.cfg
>index 9ed8297..c8a7e88 100644
>--- a/etc/mock/fedora-rawhide-i386.cfg
>+++ b/etc/mock/fedora-rawhide-i386.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'i686'
> config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-ppc.cfg b/etc/mock/fedora-rawhide-ppc.cfg
>index 7c887da..8f3c91b 100644
>--- a/etc/mock/fedora-rawhide-ppc.cfg
>+++ b/etc/mock/fedora-rawhide-ppc.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc'
> config_opts['legal_host_arches'] = ('ppc', 'ppc64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-ppc64.cfg b/etc/mock/fedora-rawhide-ppc64.cfg
>index 74e6d17..c6f70ed 100644
>--- a/etc/mock/fedora-rawhide-ppc64.cfg
>+++ b/etc/mock/fedora-rawhide-ppc64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'ppc64'
> config_opts['legal_host_arches'] = ('ppc64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-s390.cfg b/etc/mock/fedora-rawhide-s390.cfg
>index 012bb79..2dbfe1e 100644
>--- a/etc/mock/fedora-rawhide-s390.cfg
>+++ b/etc/mock/fedora-rawhide-s390.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390'
> config_opts['legal_host_arches'] = ('s390',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-s390x.cfg b/etc/mock/fedora-rawhide-s390x.cfg
>index 1d3e09f..0037ff1 100644
>--- a/etc/mock/fedora-rawhide-s390x.cfg
>+++ b/etc/mock/fedora-rawhide-s390x.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 's390x'
> config_opts['legal_host_arches'] = ('s390x',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-sparc.cfg b/etc/mock/fedora-rawhide-sparc.cfg
>index dcc2d2f..116c8f7 100644
>--- a/etc/mock/fedora-rawhide-sparc.cfg
>+++ b/etc/mock/fedora-rawhide-sparc.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'sparcv9'
> config_opts['legal_host_arches'] = ('sparc', 'sparcv9', 'sparc64')
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-sparc64.cfg b/etc/mock/fedora-rawhide-sparc64.cfg
>index 43dfe10..ec74eb3 100644
>--- a/etc/mock/fedora-rawhide-sparc64.cfg
>+++ b/etc/mock/fedora-rawhide-sparc64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'sparc64'
> config_opts['legal_host_arches'] = ('sparc64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/fedora-rawhide-x86_64.cfg b/etc/mock/fedora-rawhide-x86_64.cfg
>index 78ff851..7fa8180 100644
>--- a/etc/mock/fedora-rawhide-x86_64.cfg
>+++ b/etc/mock/fedora-rawhide-x86_64.cfg
>@@ -3,6 +3,7 @@ config_opts['target_arch'] = 'x86_64'
> config_opts['legal_host_arches'] = ('x86_64',)
> config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
> config_opts['dist'] = 'rawhide'  # only useful for --resultdir variable subst
>+config_opts['releasever'] = '21'
> 
> config_opts['yum.conf'] = """
> [main]
>diff --git a/etc/mock/site-defaults.cfg b/etc/mock/site-defaults.cfg
>index 9fff7af..2962718 100644
>--- a/etc/mock/site-defaults.cfg
>+++ b/etc/mock/site-defaults.cfg
>@@ -145,6 +145,7 @@
> # config_opts['macros']['%Add_your_macro_name_here'] = "add macro value here"
> # config_opts['files']['path/name/no/leading/slash'] = "put file contents here."
> # config_opts['chrootuid'] = os.getuid()
>+# config_opts['releasever'] = '20'
> 
> # If you change chrootgid, you must also change "mock" to the correct group
> # name in this line of the mock PAM config:
>diff --git a/py/mockbuild/backend.py b/py/mockbuild/backend.py
>index f8df77d..9ca1244 100644
>--- a/py/mockbuild/backend.py
>+++ b/py/mockbuild/backend.py
>@@ -89,6 +89,7 @@ class Root(object):
>         if isinstance(self.chroot_setup_cmd, basestring):
>             # accept strings in addition to other sequence types
>             self.chroot_setup_cmd = self.chroot_setup_cmd.split()
>+        self.releasever = config['releasever']
>         self.yum_path = '/usr/bin/yum'
>         self.yum_builddep_path = '/usr/bin/yum-builddep'
>         self.yum_builddep_opts = config['yum_builddep_opts']
>@@ -966,6 +967,8 @@ class Root(object):
>                 for eachopt in self.yum_builddep_opts.split():
>                     yumcmd.insert(1, '%s' % eachopt)
>         yumcmd.extend(('--installroot', self.makeChrootPath()))
>+        if self.releasever:
>+            yumcmd.extend(('--releasever', self.releasever))
>         if not self.online:
>             yumcmd.append("-C")
>         yumcmd.extend(self.yum_common_opts)
>diff --git a/py/mockbuild/util.py b/py/mockbuild/util.py
>index d21dad2..0c4de4c 100644
>--- a/py/mockbuild/util.py
>+++ b/py/mockbuild/util.py
>@@ -591,6 +591,7 @@ def setup_default_config_opts(unprivUid, version, pkgpythondir):
>     config_opts['use_host_resolv'] = True
>     config_opts['chroot_setup_cmd'] = ('groupinstall', 'buildsys-build')
>     config_opts['target_arch'] = 'i386'
>+    config_opts['releasever'] = None
>     config_opts['rpmbuild_arch'] = None # <-- None means set automatically from target_arch
>     config_opts['yum.conf'] = ''
>     config_opts['yum_builddep_opts'] = ''
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1056039: 853431 | 854105 | 854608