From 0def2d51d9665cd83422210ae1359d62bed38521 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin Date: Thu, 31 Mar 2016 15:37:30 +0300 Subject: [PATCH] LU-7968 lbuild: Fix reuse signature calculation Don't use an information about Lustre commits from target file content that is not directly related to kernel build which should be cached. In other words make signature independent from git commits hash. Change-Id: I3dbeb5f3a94cb947221aaa92659f14d4ea65e30a Signed-off-by: Dmitry Eremin Reviewed-on: http://review.whamcloud.com/19262 Reviewed-by: Doug Oucharek Reviewed-by: Minh Diep Tested-by: Jenkins Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index bd374fa..85d3878 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1333,7 +1333,8 @@ build_kernel_with_srpm() { local REUSE_SIGNATURE=$({ echo -en $release_str; echo $BUILD_GEN; cat "$CONFIG_FILE"; - cat "$TARGET_FILE"; + cat "$TARGET_FILE" | + sed -e '/_VERSION=/s/_[0-9]*_g.*$//g'; cat "$FULL_PATCH"; cat "$LBUILD_DIR/lbuild"; cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } | -- 1.8.3.1