From 4180aad171a3074aafe4ca8ab48688330ef0a689 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 11 May 2009 18:44:56 -0700 Subject: Add config files for F11 --- etc/mock/fedora-11-i386.cfg | 37 +++++++++++++++++++++++++++++++++++++ etc/mock/fedora-11-ppc.cfg | 39 +++++++++++++++++++++++++++++++++++++++ etc/mock/fedora-11-ppc64.cfg | 37 +++++++++++++++++++++++++++++++++++++ etc/mock/fedora-11-s390x.cfg | 37 +++++++++++++++++++++++++++++++++++++ etc/mock/fedora-11-sparc.cfg | 39 +++++++++++++++++++++++++++++++++++++++ etc/mock/fedora-11-sparc64.cfg | 37 +++++++++++++++++++++++++++++++++++++ etc/mock/fedora-11-x86_64.cfg | 41 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 267 insertions(+) create mode 100644 etc/mock/fedora-11-i386.cfg create mode 100644 etc/mock/fedora-11-ppc.cfg create mode 100644 etc/mock/fedora-11-ppc64.cfg create mode 100644 etc/mock/fedora-11-s390x.cfg create mode 100644 etc/mock/fedora-11-sparc.cfg create mode 100644 etc/mock/fedora-11-sparc64.cfg create mode 100644 etc/mock/fedora-11-x86_64.cfg diff --git a/etc/mock/fedora-11-i386.cfg b/etc/mock/fedora-11-i386.cfg new file mode 100644 index 0000000..a4fcfdb --- /dev/null +++ b/etc/mock/fedora-11-i386.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-11-i386' +config_opts['target_arch'] = 'i386' +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=fedora-11&arch=i386 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=i386 +failovermethod=priority + +[local] +name=local +baseurl=http://koji.fedoraproject.org/static-repos/dist-fc11-build-current/i386/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-11-ppc.cfg b/etc/mock/fedora-11-ppc.cfg new file mode 100644 index 0000000..b1ac1e5 --- /dev/null +++ b/etc/mock/fedora-11-ppc.cfg @@ -0,0 +1,39 @@ +config_opts['root'] = 'fedora-11-ppc' +config_opts['target_arch'] = 'ppc' +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=*.ppc64 +# 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-11&arch=ppc +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=ppc +failovermethod=priority + +[local] +name=local +baseurl=http://koji.fedoraproject.org/static-repos/dist-fc11-build-current/ppc/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-11-ppc64.cfg b/etc/mock/fedora-11-ppc64.cfg new file mode 100644 index 0000000..70ab284 --- /dev/null +++ b/etc/mock/fedora-11-ppc64.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-11-ppc64' +config_opts['target_arch'] = 'ppc64' +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=fedora-11&arch=ppc64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=ppc64 +failovermethod=priority + +[local] +name=local +baseurl=http://koji.fedoraproject.org/static-repos/dist-fc11-build-current/ppc64/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-11-s390x.cfg b/etc/mock/fedora-11-s390x.cfg new file mode 100644 index 0000000..ea521f8 --- /dev/null +++ b/etc/mock/fedora-11-s390x.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-11-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=fedora-11&arch=s390x +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=s390x +failovermethod=priority + +[local] +name=local +baseurl=http://s390.koji.fedoraproject.org/static-repos/dist-f11-build-current/s390x/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-11-sparc.cfg b/etc/mock/fedora-11-sparc.cfg new file mode 100644 index 0000000..786ba16 --- /dev/null +++ b/etc/mock/fedora-11-sparc.cfg @@ -0,0 +1,39 @@ +config_opts['root'] = 'fedora-11-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=fedora-11&arch=sparc +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=sparc +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-f11-build-current/sparc/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-11-sparc64.cfg b/etc/mock/fedora-11-sparc64.cfg new file mode 100644 index 0000000..f728602 --- /dev/null +++ b/etc/mock/fedora-11-sparc64.cfg @@ -0,0 +1,37 @@ +config_opts['root'] = 'fedora-11-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=fedora-11&arch=sparc64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=sparc64 +failovermethod=priority + +[local] +name=local +baseurl=http://sparc.koji.fedoraproject.org/static-repos/dist-f11-build-current/sparc64/ +cost=2000 +enabled=0 +""" + + + diff --git a/etc/mock/fedora-11-x86_64.cfg b/etc/mock/fedora-11-x86_64.cfg new file mode 100644 index 0000000..6898005 --- /dev/null +++ b/etc/mock/fedora-11-x86_64.cfg @@ -0,0 +1,41 @@ +config_opts['root'] = 'fedora-11-x86_64' +config_opts['target_arch'] = 'x86_64' +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 +# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all +# .i?86 packages except these. +#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 +# 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-11&arch=x86_64 +failovermethod=priority + +[updates-released] +name=updates +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=x86_64 +failovermethod=priority + +[local] +name=local +baseurl=http://koji.fedoraproject.org/static-repos/dist-fc11-build-current/x86_64/ +cost=2000 +enabled=0 +""" + + + -- cgit From 5ed31e0fa1b216c862bfe6624b3cfaf35fc9cbf6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 11 May 2009 18:49:51 -0700 Subject: version update --- configure.ac | 4 ++-- mock.spec.in | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0e7405a..ba35d63 100644 --- a/configure.ac +++ b/configure.ac @@ -4,12 +4,12 @@ #################################### # change version here. --> BOTH PLACES PLEASE! -AC_INIT([mock],[0.9.14]) +AC_INIT([mock],[0.9.15]) temp_RELEASE_NAME=mock temp_RELEASE_MAJOR=0 temp_RELEASE_MINOR=9 -temp_RELEASE_SUBLEVEL=14 +temp_RELEASE_SUBLEVEL=15 temp_RELEASE_EXTRALEVEL= #################################### diff --git a/mock.spec.in b/mock.spec.in index 5143b7f..4e92273 100644 --- a/mock.spec.in +++ b/mock.spec.in @@ -97,6 +97,9 @@ fi %attr(02775, root, mock) %dir /var/cache/mock %changelog +* Mon May 11 2009 Jesse Keating - 0.9.15-1 +- Add configs for F11 (jkeating) + * Mon Feb 02 2009 Clark Williams - 0.9.14-1 - logging cleanup (mikem) - add new exception for resultdir not available (mebrown) -- cgit From 08c3aeedd0a0e8c3e72238b407485bc5a0eee3c0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 11 May 2009 18:54:00 -0700 Subject: Build i586 on i386 for F11 and rawhide. Make rawhide dist to f12 --- etc/mock/fedora-11-i386.cfg | 2 +- etc/mock/fedora-rawhide-i386.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/mock/fedora-11-i386.cfg b/etc/mock/fedora-11-i386.cfg index a4fcfdb..2b51e6f 100644 --- a/etc/mock/fedora-11-i386.cfg +++ b/etc/mock/fedora-11-i386.cfg @@ -1,5 +1,5 @@ config_opts['root'] = 'fedora-11-i386' -config_opts['target_arch'] = 'i386' +config_opts['target_arch'] = 'i586' config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' config_opts['dist'] = 'fc11' # only useful for --resultdir variable subst diff --git a/etc/mock/fedora-rawhide-i386.cfg b/etc/mock/fedora-rawhide-i386.cfg index 8924ab6..6a0d8f5 100644 --- a/etc/mock/fedora-rawhide-i386.cfg +++ b/etc/mock/fedora-rawhide-i386.cfg @@ -1,7 +1,7 @@ config_opts['root'] = 'fedora-rawhide-i386' -config_opts['target_arch'] = 'i386' +config_opts['target_arch'] = 'i586' config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc10' # only useful for --resultdir variable subst +config_opts['dist'] = 'fc12' # only useful for --resultdir variable subst config_opts['yum.conf'] = """ [main] -- cgit From 10ca9b2d3d653ce63124f22960695082c4e33636 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 11 May 2009 18:57:40 -0700 Subject: Version bump --- configure.ac | 4 ++-- mock.spec.in | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ba35d63..be053d1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,12 +4,12 @@ #################################### # change version here. --> BOTH PLACES PLEASE! -AC_INIT([mock],[0.9.15]) +AC_INIT([mock],[0.9.16]) temp_RELEASE_NAME=mock temp_RELEASE_MAJOR=0 temp_RELEASE_MINOR=9 -temp_RELEASE_SUBLEVEL=15 +temp_RELEASE_SUBLEVEL=16 temp_RELEASE_EXTRALEVEL= #################################### diff --git a/mock.spec.in b/mock.spec.in index 4e92273..902a4fc 100644 --- a/mock.spec.in +++ b/mock.spec.in @@ -97,6 +97,9 @@ fi %attr(02775, root, mock) %dir /var/cache/mock %changelog +* Mon May 11 2009 Jesse Keating - 0.9.16-1 +- Make F11 and rawhide build i586 on i386 targets. + * Mon May 11 2009 Jesse Keating - 0.9.15-1 - Add configs for F11 (jkeating) -- cgit