From b39e1e6e3e4ea396ad842ec3695f45cfd5dfb79e Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Thu, 9 Jan 2020 09:34:28 +0800 Subject: [PATCH] LU-13092 lbuild: include lbuild-{fc,rhel,sles} to SIGNATURE We should include these files to calculate SIGNATURE, for example bump kernel extra tags could happen there. Test-Parameters: trivial Change-Id: I2c62ad765d3c6a1b9e99affe3be95a404d6140c5 Signed-off-by: Wang Shilong Reviewed-on: https://review.whamcloud.com/37076 Tested-by: jenkins Reviewed-by: Gu Zheng Tested-by: Maloo Reviewed-by: Emoly Liu Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 6e9afc7..10425c9 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1484,6 +1484,8 @@ build_kernel_with_srpm() { sed -e '/_VERSION=/s/_[0-9]*_g.*$//g'; cat "$FULL_PATCH"; cat "$LBUILD_DIR/lbuild"; + test -f lbuild-${DISTROMAJ%%[0-9]*} && + cat lbuild-${DISTROMAJ%%[0-9]*}; cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } | md5sum | cut -d" " -f1) # see if we can link to the reuse pool @@ -1609,6 +1611,8 @@ build_ofed() { echo "$BUILD_GEN")"; cat "${linux}/include/linux/autoconf.h"; cat "$LBUILD_DIR/lbuild"; + test -f lbuild-${DISTROMAJ%%[0-9]*} && + cat lbuild-${DISTROMAJ%%[0-9]*}; cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } | md5sum | cut -d" " -f1) # see if we can link to the reuse pool -- 1.8.3.1