Hello community, here is the log from the commit of package drbd for openSUSE:Factory checked in at 2017-07-21 22:49:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd (Old) and /work/SRC/openSUSE:Factory/.drbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd" Fri Jul 21 22:49:43 2017 rev:60 rq:511431 version:9.0.8+git.c8bc3670 Changes: -------- --- /work/SRC/openSUSE:Factory/drbd/drbd.changes 2017-06-23 09:18:45.627080839 +0200 +++ /work/SRC/openSUSE:Factory/.drbd.new/drbd.changes 2017-07-21 22:49:45.453695655 +0200 @@ -1,0 +2,6 @@ +Wed Jul 19 05:01:10 UTC 2017 - [email protected] + +- Add reproducible.patch to sort file lists (boo#1041090) + and to override build date (boo#1047218) to fix build-compare + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd.spec ++++++ --- /var/tmp/diff_new_pack.lw6UE9/_old 2017-07-21 22:49:46.265581127 +0200 +++ /var/tmp/diff_new_pack.lw6UE9/_new 2017-07-21 22:49:46.269580563 +0200 @@ -14,10 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - # needssslcertforbuild + %if ! 0%{?is_opensuse} %ifarch x86_64 %define buildrt 1 @@ -37,6 +36,8 @@ Source2: Module.supported Source3: drbd_git_revision Patch1: fix-resync-finished-with-syncs-have-bits-set.patch +# PATCH-FIX-UPSTREAM bmwiedemann +Patch2: reproducible.patch BuildRequires: kernel-source BuildRequires: kernel-syms BuildRequires: module-init-tools @@ -69,6 +70,7 @@ %prep %setup -q -n drbd-%{version} %patch1 -p1 +%patch2 -p1 mkdir source cp -a drbd/. source/. || : @@ -79,6 +81,7 @@ mkdir obj ln -s ../scripts obj/ +export WANT_DRBD_REPRODUCIBLE_BUILD=1 export CONFIG_BLK_DEV_DRBD=m export EXTRA_CFLAGS='-DVERSION=\"%{version}\"' ++++++ reproducible.patch ++++++ commit 9777375cea4d39a6298b774c80eb1287836b217d Author: Bernhard M. Wiedemann <[email protected]> Date: Mon Jul 17 21:05:47 2017 +0200 drbd: sort file list because it influences the ordering of entries in compat.h which influences srcversion= checksum which prevents drbd.ko from building reproducibly. See https://reproducible-builds.org/ for why this matters. diff --git a/drbd/Kbuild b/drbd/Kbuild index 2d1b4d0..c5787a6 100644 --- a/drbd/Kbuild +++ b/drbd/Kbuild @@ -70,7 +70,7 @@ COMPAT_FORCE := FORCE endif ifneq ($(KBUILD_STAGE),modpost) -TEST_C := $(wildcard $(src)/drbd-kernel-compat/tests/*.c) +TEST_C := $(sort $(wildcard $(src)/drbd-kernel-compat/tests/*.c)) TEST_R := $(TEST_C:$(src)/drbd-kernel-compat/tests/%.c=$(obj)/.compat_test.%.result) $(obj)/.compat_test.%.result: $(src)/drbd-kernel-compat/tests/%.c $(COMPAT_FORCE) $(call cmd,compat_test_result) commit 794951592b004e82c0160014751d9ebb654035c0 Author: Bernhard M. Wiedemann <[email protected]> Date: Tue Jul 18 10:30:16 2017 +0200 drbd: Allow to override build date (v3) and to not record build user and hostname if requested in order to allow for reproducible builds. See https://reproducible-builds.org/ for why this is good and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. diff --git a/drbd/Kbuild b/drbd/Kbuild index 2d1b4d0..80b8099 100644 --- a/drbd/Kbuild +++ b/drbd/Kbuild @@ -134,5 +134,10 @@ $(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y)) echo >&2 "Your DRBD source tree is broken. Unpack again."; \ exit 1; \ fi ; \ - echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}"; \ + if [ -z "${WANT_DRBD_REPRODUCIBLE_BUILD}" ] || [ -z "${SOURCE_DATE_EPOCH}" ] ; then \ + buildinfo="build by $$USER@$$HOSTNAME, `date "+%F %T"`" ; \ + else \ + buildinfo="reproducible build, `date -u -d@${SOURCE_DATE_EPOCH} "+%F %T"`" ; \ + fi ; \ + echo -e "\t\t\" $$buildinfo\";\n}"; \ mv -f [email protected] $@
