On Fri, Dec 07, 2018 at 01:08:50AM +0200, Apollon Oikonomopoulos wrote:
> Agreed. Unfortunately, the patch is malformed, [...]
Oops, sorry about that. Not sure why it happened.
Sending you the ganeti-2.15 patch now instead which should be identical.
(Since I don't have access to the computer where I prepped the work
on right now.)
Regards,
Andreas Henriksson
diff -Nru ganeti-2.15-2.15.2/debian/changelog
ganeti-2.15-2.15.2/debian/changelog
--- ganeti-2.15-2.15.2/debian/changelog 2018-11-22 14:51:16.000000000 +0100
+++ ganeti-2.15-2.15.2/debian/changelog 2018-12-06 18:46:43.000000000 +0100
@@ -1,3 +1,11 @@
+ganeti-2.15 (2.15.2-12.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Explicitly specify path for ip(route2)
+ - fixes reproducible build on merged-usr vs non-merged systems
+
+ -- Andreas Henriksson <andr...@fatal.se> Thu, 06 Dec 2018 18:46:43 +0100
+
ganeti-2.15 (2.15.2-12) unstable; urgency=medium
* Allow newer haskell-temporary versions
diff -Nru ganeti-2.15-2.15.2/debian/rules ganeti-2.15-2.15.2/debian/rules
--- ganeti-2.15-2.15.2/debian/rules 2018-11-22 14:44:05.000000000 +0100
+++ ganeti-2.15-2.15.2/debian/rules 2018-12-06 18:46:35.000000000 +0100
@@ -51,6 +51,7 @@
override_dh_auto_configure:
dpkg-parsechangelog -Sversion > vcs-version
./configure \
+ IP_PATH=/bin/ip \
--prefix=/usr \
--localstatedir=/var \
--sysconfdir=/etc \
