From 50f5f1e924e48474f8dec32c4135d19fd183a3e8 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 7 Dec 2015 19:58:49 +0100
Subject: reproducible fedora: try harder to configure mock correctly

---
 TODO                                               |  1 +
 bin/reproducible_setup_mock.sh                     |  2 +-
 .../etc/fedora-23-x86_64.cfg                       | 61 ++++++++++++++++++++++
 .../etc/yum/repos.d/fedora-23-src                  |  7 +++
 .../etc/yum/repos.d/fedora23-src                   |  7 ---
 5 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 hosts/profitbricks-build3-amd64/etc/fedora-23-x86_64.cfg
 create mode 100644 hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src
 delete mode 100644 hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora23-src

diff --git a/TODO b/TODO
index bf6cee65..e0c6d9b7 100644
--- a/TODO
+++ b/TODO
@@ -306,6 +306,7 @@ This is about Debian, below are more todo entries for other projects…
 * then configure+use mock to build:
 ** 'sudo mock -r fedora-20-x86_64 --init'
 ** 'sudo mock -r fedora-20-x86_64 sudo-1.8.14p3-1.fc23.src.rpm'
+* baseurl=http://fedora.mirrors.telekom.ro/pub/fedora/linux/development/23/source/SRPMS is really not so good…
 
 * more notes:
 ** http://blog.packagecloud.io/eng/2015/05/11/building-rpm-packages-with-mock/
diff --git a/bin/reproducible_setup_mock.sh b/bin/reproducible_setup_mock.sh
index c404eecb..711d2d9f 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -19,5 +19,5 @@ DISTRO=$1
 ARCHITECTURE=$2
 
 echo "$(date -u) - starting to configure mock for ${DISTRO} on ${ARCHITECTURE} now."
-sudo mock -r ${DISTRO}-${ARCHITECTURE} --init
+sudo /usr/bin/mock -r ${DISTRO}-${ARCHITECTURE} --init
 echo "$(date -u) - mock configured for ${DISTRO} on ${ARCHITECTURE} now."
diff --git a/hosts/profitbricks-build3-amd64/etc/fedora-23-x86_64.cfg b/hosts/profitbricks-build3-amd64/etc/fedora-23-x86_64.cfg
new file mode 100644
index 00000000..c05a8452
--- /dev/null
+++ b/hosts/profitbricks-build3-amd64/etc/fedora-23-x86_64.cfg
@@ -0,0 +1,61 @@
+config_opts['root'] = 'fedora-23-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64',)
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc23'  # 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
+syslog_ident=mock
+syslog_device=
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-23&arch=x86_64
+failovermethod=priority
+
+[updates]
+name=updates
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f23&arch=x86_64
+failovermethod=priority
+
+[updates-testing]
+name=updates-testing
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f23&arch=x86_64
+failovermethod=priority
+enabled=0
+
+[local]
+name=local
+baseurl=http://kojipkgs.fedoraproject.org/repos/f23-build/latest/x86_64/
+cost=2000
+enabled=0
+
+[fedora-debuginfo]
+name=fedora-debuginfo
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-23&arch=x86_64
+failovermethod=priority
+enabled=0
+
+[updates-debuginfo]
+name=updates-debuginfo
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f23&arch=x86_64
+failovermethod=priority
+enabled=0
+
+[updates-testing-debuginfo]
+name=updates-testing-debuginfo
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f23&arch=x86_64
+failovermethod=priority
+enabled=0
+"""
diff --git a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src
new file mode 100644
index 00000000..3db137ba
--- /dev/null
+++ b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src
@@ -0,0 +1,7 @@
+[fedora-23-src]
+name=fedora 23 sources
+baseurl=http://fedora.mirrors.telekom.ro/pub/fedora/linux/development/23/source/SRPMS
+enabled=1
+gpgcheck=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+
diff --git a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora23-src b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora23-src
deleted file mode 100644
index 78a7e37b..00000000
--- a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora23-src
+++ /dev/null
@@ -1,7 +0,0 @@
-[fedora23-src]
-name=fedora 23 sources
-baseurl=http://fedora.mirrors.telekom.ro/pub/fedora/linux/development/23/source/SRPMS
-enabled=1
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-
-- 
cgit v1.2.3-70-g09d2