From 77e69f96ca04f9eaf56117785e5232437a7cebda Mon Sep 17 00:00:00 2001
From: "Slater, Joseph" <joe.slater@windriver.com>
Date: Fri, 17 Jul 2020 13:59:56 -0700
Subject: [PATCH] lvm2: reproducible binaries

For reproducible binaries, create a static CONFIGURE_LINE
during configuration rather than reporting the command line
invoking configure.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../lvm2/files/reproducible-build.patch       | 24 +++++++++++++++++++
 meta-oe/recipes-support/lvm2/lvm2.inc         |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 meta-oe/recipes-support/lvm2/files/reproducible-build.patch

diff --git a/meta-oe/recipes-support/lvm2/files/reproducible-build.patch b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
new file mode 100644
index 0000000000..db598a88cb
--- /dev/null
+++ b/meta-oe/recipes-support/lvm2/files/reproducible-build.patch
@@ -0,0 +1,24 @@
+configure.ac:  override CONFIGURE_LINE
+
+For reproducible binaries, we need to report a constant CONFIGURE_LINE.
+This patched is only applied for such builds.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Joe Slater <joe.slater@windriver.com>
+
+
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -15,7 +15,10 @@ AC_PREREQ(2.69)
+ ################################################################################
+ dnl -- Process this file with autoconf to produce a configure script.
+ AC_INIT
+-CONFIGURE_LINE="$0 $@"
++dnl The default CONFIGURE_LINE has been overridden for reproducible binaries
++dnl CONFIGURE_LINE="$0 $@"
++CONFIGURE_LINE="configure parameters are not available for reproducible builds"
++
+ AC_CONFIG_SRCDIR([lib/device/dev-cache.h])
+ AC_CONFIG_HEADERS([include/configure.h])
+ 
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 01c9df45c1..ab618b4369 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -15,7 +15,9 @@ SRC_URI = "git://sourceware.org/git/lvm2.git \
            file://0001-Avoid-bashisms-in-init-scripts.patch \
            file://0005-do-not-build-manual.patch \
            file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
+           ${@bb.utils.contains('BUILD_REPRODUCIBLE_BINARIES','1','file://reproducible-build.patch','', d)} \
            "
+
 SRCREV = "b9391b1b9f0b73303fa21f8f92574d17ce4c2b02"
 S = "${WORKDIR}/git"