From c3b1cc4105780b0807ddc5638aa5b93082891a76dd4852a0e68e0967f9d11b6b Mon Sep 17 00:00:00 2001 From: Lars Marowsky-Bree Date: Wed, 19 Jul 2017 07:00:23 +0000 Subject: [PATCH] Accepting request 511346 from home:bmwiedemann:branches:network:ha-clustering:Factory Add reproducible.patch to sort file lists (boo#1041090) and to override build date (boo#1047218) to fix build-compare OBS-URL: https://build.opensuse.org/request/show/511346 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=51 --- drbd.changes | 6 ++++++ drbd.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drbd.changes b/drbd.changes index 37a2f91..cf24e22 100644 --- a/drbd.changes +++ b/drbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 19 05:01:10 UTC 2017 - bwiedemann@suse.com + +- Add reproducible.patch to sort file lists (boo#1041090) + and to override build date (boo#1047218) to fix build-compare + ------------------------------------------------------------------- Wed Jun 14 03:21:59 UTC 2017 - nwang@suse.com diff --git a/drbd.spec b/drbd.spec index 48c6824..638b41e 100644 --- a/drbd.spec +++ b/drbd.spec @@ -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 @@ Source1: preamble 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 @@ installed kernel. %prep %setup -q -n drbd-%{version} %patch1 -p1 +%patch2 -p1 mkdir source cp -a drbd/. source/. || : @@ -79,6 +81,7 @@ rm -rf obj mkdir obj ln -s ../scripts obj/ +export WANT_DRBD_REPRODUCIBLE_BUILD=1 export CONFIG_BLK_DEV_DRBD=m export EXTRA_CFLAGS='-DVERSION=\"%{version}\"'