EX-3176 build: remove extra_version from kernel rpm

This will allow us to use the same kernel for both
ES5 and ES6

Change-Id: I7e49f97b28d6e74ab6fe79f0438900c3ebd665df
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/43708
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/contrib/lbuild/lbuild-rhel b/contrib/lbuild/lbuild-rhel
index 528a4c9..043ef49 100644 (file)
--- a/contrib/lbuild/lbuild-rhel
+++ b/contrib/lbuild/lbuild-rhel
@@ -49,9 +49,9 @@ prepare_and_build_srpm() {
        # create the buildid
        local ddn_tag="ddn13"
        if $ENABLE_KERNEL_DEBUG; then
-               local buildid="_lustre_debug${EXTRA_VERSION##*_lustre}.${ddn_tag}"
+               local buildid="_lustre_debug.${ddn_tag}"
        else
-               local buildid="_lustre${EXTRA_VERSION##*_lustre}.${ddn_tag}"
+               local buildid="_lustre.${ddn_tag}"
        fi
 
        # edit the SPEC with our changes