From 53f02787c24428a4176896b1c8f3bf41ae67d68f Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 7 Dec 2015 20:40:14 +0100
Subject: reproducible rpms: configure mock nicely

---
 TODO                                                       | 14 +++++++-------
 bin/reproducible_setup_mock.sh                             | 12 +++++++++---
 hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora     | 11 -----------
 .../etc/yum/repos.d/fedora-23-src                          |  7 -------
 .../etc/yum/repos.d/fedora-23-src.repo                     |  7 +++++++
 .../profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo  | 11 +++++++++++
 6 files changed, 34 insertions(+), 28 deletions(-)
 delete mode 100644 hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora
 delete mode 100644 hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src
 create mode 100644 hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src.repo
 create mode 100644 hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo

diff --git a/TODO b/TODO
index 32581198..ce3a579c 100644
--- a/TODO
+++ b/TODO
@@ -299,13 +299,13 @@ This is about Debian, below are more todo entries for other projects…
 
 ==== reproducible Fedora
 
-* call the script reproducible_rpms.sh as it can also build OpenSuSE packages
-** see below for '/etc/yum/repos.d/'
-* then use yumdownloader to download rpms: 'yumdownloader --source sudo'
-** https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=X86_64 has a list of repos
-* then configure+use mock to build:
-** '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…
+* build script
+** call the script reproducible_rpms.sh as it can also build OpenSuSE packages
+** then use yumdownloader to download rpms: 'yumdownloader --source sudo'
+** use mock to build:  'mock -r fedora-23-x86_64 --resultdir=. sudo-1.8.14p3-1.fc23.src.rpm'
+* hosts/pb-build3/etc/yum/repos.d/* is really not sooo good but works…
+* how to get a list of packages?
+* build rawhide instead of fedora-23?
 
 * 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 2385693d..37d2b21d 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -18,6 +18,12 @@ fi
 DISTRO=$1
 ARCHITECTURE=$2
 
-echo "$(date -u) - starting to configure mock for ${DISTRO} on ${ARCHITECTURE} now."
-mock -r ${DISTRO}-${ARCHITECTURE} --init
-echo "$(date -u) - mock configured for ${DISTRO} on ${ARCHITECTURE} now."
+echo "$(date -u) - showing setup."
+dpkg -l mock
+id
+echo "$(date -u) - starting to cleanly configure mock for ${DISTRO} on ${ARCHITECTURE}."
+set -x
+mock -r ${DISTRO}-${ARCHITECTURE} --resultdir=. --clean
+mock -r ${DISTRO}-${ARCHITECTURE} --resultdir=. --init
+set +x
+echo "$(date -u) - mock configured for ${DISTRO} on ${ARCHITECTURE}."
diff --git a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora
deleted file mode 100644
index d7cf7436..00000000
--- a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora
+++ /dev/null
@@ -1,11 +0,0 @@
-[fedora]
-name=Fedora $releasever - $basearch
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=1
-#metadata_expire=7d
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
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
deleted file mode 100644
index 3db137ba..00000000
--- a/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src
+++ /dev/null
@@ -1,7 +0,0 @@
-[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/fedora-23-src.repo b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src.repo
new file mode 100644
index 00000000..fb948356
--- /dev/null
+++ b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora-23-src.repo
@@ -0,0 +1,7 @@
+[fedora-23-src]
+name=fedora 23 sources
+baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/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/fedora.repo b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo
new file mode 100644
index 00000000..a431739d
--- /dev/null
+++ b/hosts/profitbricks-build3-amd64/etc/yum/repos.d/fedora.repo
@@ -0,0 +1,11 @@
+[fedora]
+name=Fedora $releasever - $basearch
+failovermethod=priority
+#baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/$releasever/Everything/$basearch/os/
+baseurl=http://ftp.informatik.uni-frankfurt.de/fedora/releases/23/Everything/x86_64/os/
+enabled=1
+#metadata_expire=7d
+gpgcheck=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+skip_if_unavailable=False
+
-- 
cgit v1.2.3-54-g00ecf