Whamcloud - gitweb
LU-13092 lbuild: include lbuild-{fc,rhel,sles} to SIGNATURE 76/37076/4
authorWang Shilong <wshilong@ddn.com>
Thu, 9 Jan 2020 01:34:28 +0000 (09:34 +0800)
committerOleg Drokin <green@whamcloud.com>
Thu, 23 Jan 2020 05:31:49 +0000 (05:31 +0000)
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 <wshilong@ddn.com>
Reviewed-on: https://review.whamcloud.com/37076
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Gu Zheng <gzheng@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Emoly Liu <emoly@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
contrib/lbuild/lbuild

index 6e9afc7..10425c9 100755 (executable)
@@ -1484,6 +1484,8 @@ build_kernel_with_srpm() {
                                   sed -e '/_VERSION=/s/_[0-9]*_g.*$//g';
                                   cat "$FULL_PATCH";
                                   cat "$LBUILD_DIR/lbuild";
                                   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
                                   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";
                                   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
                                   cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } |
                                 md5sum | cut -d" " -f1)
         # see if we can link to the reuse pool