From d224591a27ae6b180a514d385bce304b0a2ea9a1 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sun, 21 Dec 2008 11:50:29 -0500 Subject: Don't disable ccache on epel-5, it is available Signed-off-by: Todd Zullinger --- etc/mock/epel-5-i386.cfg | 3 --- etc/mock/epel-5-ppc.cfg | 3 --- etc/mock/epel-5-x86_64.cfg | 3 --- 3 files changed, 9 deletions(-) diff --git a/etc/mock/epel-5-i386.cfg b/etc/mock/epel-5-i386.cfg index 30c66ee..9b9b6ef 100644 --- a/etc/mock/epel-5-i386.cfg +++ b/etc/mock/epel-5-i386.cfg @@ -3,9 +3,6 @@ config_opts['target_arch'] = 'i386' config_opts['chroot_setup_cmd'] = 'install buildsys-build' config_opts['dist'] = 'el5' # only useful for --resultdir variable subst -# ccache not available on epel5 -config_opts['plugin_conf']['ccache_enable'] = False - config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/etc/mock/epel-5-ppc.cfg b/etc/mock/epel-5-ppc.cfg index b07d136..1bd72a7 100644 --- a/etc/mock/epel-5-ppc.cfg +++ b/etc/mock/epel-5-ppc.cfg @@ -3,9 +3,6 @@ config_opts['target_arch'] = 'ppc' config_opts['chroot_setup_cmd'] = 'install buildsys-build' config_opts['dist'] = 'el5' # only useful for --resultdir variable subst -# ccache not available on epel5 -config_opts['plugin_conf']['ccache_enable'] = False - config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum diff --git a/etc/mock/epel-5-x86_64.cfg b/etc/mock/epel-5-x86_64.cfg index d0a8cde..0fe89d4 100644 --- a/etc/mock/epel-5-x86_64.cfg +++ b/etc/mock/epel-5-x86_64.cfg @@ -3,9 +3,6 @@ config_opts['target_arch'] = 'x86_64' config_opts['chroot_setup_cmd'] = 'install buildsys-build' config_opts['dist'] = 'el5' # only useful for --resultdir variable subst -# ccache not available on epel5 -config_opts['plugin_conf']['ccache_enable'] = False - config_opts['yum.conf'] = """ [main] cachedir=/var/cache/yum -- cgit From 324ef3f812b15dfe4fc552f8962020f4ba0a8e35 Mon Sep 17 00:00:00 2001 From: Michael E Brown Date: Wed, 7 Jan 2009 14:53:19 -0600 Subject: add configs from dgilmore for sparc, s390 --- etc/mock/fedora-10-s390x.cfg | 37 +++++++++++++++++++++++++++++++++++ etc/mock/fedora-10-sparc.cfg | 39 +++++++++++++++++++++++++++++++++++++ etc/mock/fedora-10-sparc64.cfg | 37 +++++++++++++++++++++++++++++++++++ etc/mock/fedora-9-s390x.cfg | 37 +++++++++++++++++++++++++++++++++++ etc/mock/fedora-9-sparc.cfg | 39 +++++++++++++++++++++++++++++++++++++ etc/mock/fedora-9-sparc64.cfg | 37 +++++++++++++++++++++++++++++++++++ etc/mock/fedora-rawhide-s390x.cfg | 29 +++++++++++++++++++++++++++ etc/mock/fedora-rawhide-sparc.cfg | 31 +++++++++++++++++++++++++++++ etc/mock/fedora-rawhide-sparc64.cfg | 29 +++++++++++++++++++++++++++ 9 files changed, 315 insertions(+) create mode 100644 etc/mock/fedora-10-s390x.cfg create mode 100644 etc/mock/fedora-10-sparc.cfg create mode 100644 etc/mock/fedora-10-sparc64.cfg create mode 100644 etc/mock/fedora-9-s390x.cfg create mode 100644 etc/mock/fedora-9-sparc.cfg create mode 100644 etc/mock/fedora-9-sparc64.cfg create mode 100644 etc/mock/fedora-rawhide-s390x.cfg create mode 100644 etc/mock/fedora-rawhide-sparc.cfg create mode 100644 etc/mock/fedora-rawhide-sparc64.cfg diff --git a/etc/mock/fedora-10-s390x.cfg b/etc/mock/fedora-10-s390x.cfg new file mode 100644 index 0000000..576aaf2 --- /dev/null +++ b/etc/mock/fedora-10-s390x.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-10-s390x' +config_opts['target_arch'] = 's390x' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc10' # only useful for --resultdir variable subst + +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-10&arch=s390x +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=s390x +failovermethod=priority + +[local] +name=local +baseurl=http://s390.koji.fedoraproject.org/static-repos/dist-f10-build-current/s390x/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-10-sparc.cfg b/etc/mock/fedora-10-sparc.cfg new file mode 100644 index 0000000..f71bc8c --- /dev/null +++ b/etc/mock/fedora-10-sparc.cfg @@ -0,0 +1,39 @@ +config_opts['root'] = 'fedora-10-sparc' +config_opts['target_arch'] = 'sparcv9' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc10' # only useful for --resultdir variable subst + +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=*.sparc64 +# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=sparc +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=sparc +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-f10-build-current/sparc/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-10-sparc64.cfg b/etc/mock/fedora-10-sparc64.cfg new file mode 100644 index 0000000..7a6af9d --- /dev/null +++ b/etc/mock/fedora-10-sparc64.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-10-sparc64' +config_opts['target_arch'] = 'sparc64' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc10' # only useful for --resultdir variable subst + +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-10&arch=sparc64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=sparc64 +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-f10-build-current/sparc64/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-9-s390x.cfg b/etc/mock/fedora-9-s390x.cfg new file mode 100644 index 0000000..85eb30b --- /dev/null +++ b/etc/mock/fedora-9-s390x.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-9-s390x' +config_opts['target_arch'] = 's390x' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc9' # only useful for --resultdir variable subst + +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-9&arch=s390x +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9.newkey&arch=s390x +failovermethod=priority + +[local] +name=local +baseurl=http://s390.koji.fedoraproject.org/static-repos/dist-f9-build-current/s390x/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-9-sparc.cfg b/etc/mock/fedora-9-sparc.cfg new file mode 100644 index 0000000..a3be166 --- /dev/null +++ b/etc/mock/fedora-9-sparc.cfg @@ -0,0 +1,39 @@ +config_opts['root'] = 'fedora-9-sparc' +config_opts['target_arch'] = 'sparcv9' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc9' # only useful for --resultdir variable subst + +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=*.sparc64 +# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=sparc +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9.newkey&arch=sparc +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-f9-build-current/sparc/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-9-sparc64.cfg b/etc/mock/fedora-9-sparc64.cfg new file mode 100644 index 0000000..b7606aa --- /dev/null +++ b/etc/mock/fedora-9-sparc64.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-9-sparc64' +config_opts['target_arch'] = 'sparc64' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc9' # only useful for --resultdir variable subst + +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-9&arch=sparc64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9.newkey&arch=sparc64 +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-f9-build-current/sparc64/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-rawhide-s390x.cfg b/etc/mock/fedora-rawhide-s390x.cfg new file mode 100644 index 0000000..fd64134 --- /dev/null +++ b/etc/mock/fedora-rawhide-s390x.cfg @@ -0,0 +1,29 @@ +config_opts['root'] = 'fedora-rawhide-s390x' +config_opts['target_arch'] = 's390x' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc11' # only useful for --resultdir variable subst + +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=s390x +failovermethod=priority + +[local] +name=local +baseurl=http://s390.koji.fedoraproject.org/static-repos/dist-rawhide-current/s390x/ +cost=2000 +enabled=0 +""" diff --git a/etc/mock/fedora-rawhide-sparc.cfg b/etc/mock/fedora-rawhide-sparc.cfg new file mode 100644 index 0000000..73770a4 --- /dev/null +++ b/etc/mock/fedora-rawhide-sparc.cfg @@ -0,0 +1,31 @@ +config_opts['root'] = 'fedora-rawhide-sparc' +config_opts['target_arch'] = 'sparcv9' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc11' # only useful for --resultdir variable subst + +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=*.sparc64 +# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. + +# repos + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=sparc +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-rawhide-current/sparc/ +cost=2000 +enabled=0 +""" diff --git a/etc/mock/fedora-rawhide-sparc64.cfg b/etc/mock/fedora-rawhide-sparc64.cfg new file mode 100644 index 0000000..e3d85b1 --- /dev/null +++ b/etc/mock/fedora-rawhide-sparc64.cfg @@ -0,0 +1,29 @@ +config_opts['root'] = 'fedora-rawhide-sparc64' +config_opts['target_arch'] = 'sparc64' +config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' +config_opts['dist'] = 'fc11' # only useful for --resultdir variable subst + +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=sparc64 +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-rawhide-current/sparc64/ +cost=2000 +enabled=0 +""" -- cgit From a9c9f083e197a9ffe83003230b635730af66e3ba Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 7 Jan 2009 18:59:21 -0500 Subject: Fix git log command used for ChangeLog and AUTHORS The git-* commands are not in the PATH by default with git >= 1.6.0. Signed-off-by: Todd Zullinger --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index aefcad8..4fe1e7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,10 +58,10 @@ CLEANFILES += py/*.pyc py/mock/*.pyc py/mock/plugins/*.pyc dist: ChangeLog AUTHORS ChangeLog: - (GIT_DIR=.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + (GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) AUTHORS: - (GIT_DIR=.git git-log | grep ^Author | sort |uniq > .authors.tmp && mv .authors.tmp AUTHORS; rm -f .authors.tmp) || (touch AUTHORS; echo 'git directory not found: installing possibly empty AUTHORS.' >&2) + (GIT_DIR=.git git log | grep ^Author | sort |uniq > .authors.tmp && mv .authors.tmp AUTHORS; rm -f .authors.tmp) || (touch AUTHORS; echo 'git directory not found: installing possibly empty AUTHORS.' >&2) REPLACE_VARS_ON_INSTALL=$(sbindir)/mock.py install-exec-hook: -- cgit