Whamcloud - gitweb
LU-13092 lbuild: include lbuild-{fc,rhel,sles} to SIGNATURE 12/37312/2
authorWang Shilong <wshilong@ddn.com>
Thu, 9 Jan 2020 01:34:28 +0000 (09:34 +0800)
committerOleg Drokin <green@whamcloud.com>
Mon, 27 Jan 2020 23:12:29 +0000 (23:12 +0000)
We should include these files to calculate SIGNATURE, for example
bump kernel extra tags could happen there.

Lustre-change: https://review.whamcloud.com/37076
Lustre-commit: b39e1e6e3e4ea396ad842ec3695f45cfd5dfb79e

Test-Parameters: trivial
Change-Id: I2c62ad765d3c6a1b9e99affe3be95a404d6140c5
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Gu Zheng <gzheng@ddn.com>
Reviewed-by: Emoly Liu <emoly@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/37312
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
contrib/lbuild/lbuild

index f1f91d9..563e3e1 100755 (executable)
@@ -1503,6 +1503,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
@@ -1628,6 +1630,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