summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rwxr-xr-xbin/reproducible_build_archlinux_pkg.sh1
-rwxr-xr-xbin/reproducible_build_rpm.sh3
-rwxr-xr-xbin/reproducible_setup_mock.sh2
4 files changed, 6 insertions, 2 deletions
diff --git a/TODO b/TODO
index 67cdadd3..883933cc 100644
--- a/TODO
+++ b/TODO
@@ -281,6 +281,8 @@ This is about Debian, below are more todo entries for other projects…
==== reproducible Fedora
+* 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:
** mock --clean just uninstalls the chroot but it'll still be rebuilt next time using cache. you can delete the caches from /var/cache/mock/ or touch the mock config
** is /etc/yum/repos.d/fedora.repo really needed?
diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index d6f1a5e1..0bd25502 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -217,7 +217,6 @@ cd $TMPDIR
TIMEOUT=8 # maximum time in hours for a single build
DATE=$(date -u +'%Y-%m-%d %H:%M')
START=$(date +'%s')
-BUILDER="${JOB_NAME#reproducible_builder_}/${BUILD_ID}"
DUMMY=$(mktemp -t archlinux-dummy-XXXXXXXX)
#
diff --git a/bin/reproducible_build_rpm.sh b/bin/reproducible_build_rpm.sh
index 26fa444f..34e11e25 100755
--- a/bin/reproducible_build_rpm.sh
+++ b/bin/reproducible_build_rpm.sh
@@ -175,7 +175,6 @@ cd $TMPDIR
DATE=$(date -u +'%Y-%m-%d %H:%M')
START=$(date +'%s')
-BUILDER="${JOB_NAME#reproducible_builder_}/${BUILD_ID}"
DUMMY=$(mktemp -t rpm-dummy-XXXXXXXX)
touch -d "$(date -u -d "6 hours ago" '+%Y-%m-%d %H:%M') UTC" $DUMMY
RPM_STAMPS=/srv/reproducible-results/.rpm_stamp
@@ -214,6 +213,8 @@ RELEASE="$1"
ARCH="$2"
SRCPACKAGE="" # package name
SRC_RPM="" # src rpm file name
+# not used yet:
+UNIQEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}"
#update_mock # FIXME: we dont have to run mock on the main node yet, but we will need at least have to update yum there…
choose_package
# build package twice
diff --git a/bin/reproducible_setup_mock.sh b/bin/reproducible_setup_mock.sh
index 46704c2d..fe4d8656 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -17,6 +17,8 @@ if [ -z "$1" ] || [ -z "$2" ] ; then
fi
RELEASE=$1
ARCH=$2
+# not used yet:
+UNIQEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}"
echo "$(date -u) - showing setup."
dpkg -l mock