From 86784fd66287e6732fc2e6d8d53bbd6f5d7c3c80 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 17 Dec 2015 17:32:28 +0100
Subject: reproducible rpms: cleanup

---
 TODO                           | 4 ++--
 bin/reproducible_build_rpm.sh  | 2 +-
 bin/reproducible_setup_mock.sh | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index fd400db3..b60cce72 100644
--- a/TODO
+++ b/TODO
@@ -283,7 +283,7 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 
 ==== reproducible Fedora
 
-* dont hardcode 23 in reproducible_setup_mock.sh
+* dont hardcode 23 in reproducible_setup_mock.sh and …build_rpm.sh
 * use mock in parallel with --uniqeext
 ** task: needs to be passed via ssh too (and we want ssh to do remote builds like debian from one master node)
 * setup script:
@@ -300,7 +300,7 @@ The plan is to run a jenkins.d.o host, which is maintained by DSA, but we are ma
 ** verify gpg signatures (via /etc/mock/)
 ** one day we will want to schedule all 17k source packages in fedora…
 * hosts/pb-build3/etc/yum/repos.d/* is really not sooo good but works…
-* build rawhide too (once fedora-23 builds nicely)
+* build rawhide too (once fedora-23 builds nicely), releasever=rawhide
 
 * more notes:
 ** https://fedoraproject.org/wiki/Using_Mock_to_test_package_builds
diff --git a/bin/reproducible_build_rpm.sh b/bin/reproducible_build_rpm.sh
index 8256c276..3b66fc89 100755
--- a/bin/reproducible_build_rpm.sh
+++ b/bin/reproducible_build_rpm.sh
@@ -43,7 +43,7 @@ update_mock() {
 		echo "$(date -u ) - updating mock for $RELEASE ($ARCH) on $HOSTNAME now..."
 		mock -r $RELEASE-$ARCH --resultdir=. --cleanup-after -v --update 2>&1
 		echo "$(date -u ) - mock updated."
-		yum -v --releasever=23 check-update # FIXME: dont hard-code releasever here. rawhide?
+		yum -v --releasever=23 check-update # FIXME: dont hard-code releasever here.
 		echo "$(date -u ) - yum updated."
 		touch $STAMP
 	else
diff --git a/bin/reproducible_setup_mock.sh b/bin/reproducible_setup_mock.sh
index 072a7c4b..240b693d 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -23,9 +23,11 @@ UNIQEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}"
 echo "$(date -u) - showing setup."
 dpkg -l mock
 id
-echo "$(date -u) - cleaning yum."
+echo "$(date -u) - cleaning ~/.rpmdb"
 rm ~/.rpmdb -rf
+echo "$(date -u) - cleaning yum"
 yum -v --releasever=23 clean all
+echo "$(date -u) - initialising yum for $RELEASE"
 yum -v --releasever=23 check
 yum -v --releasever=23 repolist all
 echo "$(date -u) - starting to cleanly configure mock for $RELEASE on $ARCH."
@@ -41,6 +43,4 @@ echo "$(date -u) - mock --install rpm-build yum"
 mock -r $RELEASE-$ARCH --resultdir=. -v --install rpm-build yum
 echo "$(date -u) - mock --update"
 mock -r $RELEASE-$ARCH --resultdir=. -v --update
-#echo "$(date -u) - dnf makecache"
-#mock -r $RELEASE-$ARCH --resultdir=. -v --chroot -- dnf --releasever=23 makecache
 
-- 
cgit v1.2.3-70-g09d2