X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild;h=17f62b53ae51731d76ba885a64e817a2c7279c28;hp=358f36c9c6616ceb79713cdec89f90b155e82d82;hb=28254f0b2726bc540d57dac1dbb16e8a3e45b411;hpb=4dd31baae9a73502c5c7bb5c0962fd703e231fd5

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 358f36c..17f62b5 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -620,7 +620,7 @@ load_target() {
     fi
 
     if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config ]; then
-        CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH${RPMSMPTYPE:+-}${RPMSMPTYPE}.config"
+        CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config"
     fi
 
     local lnxrelnew=${lnxrel//-/_}
@@ -901,8 +901,8 @@ build_spl_zfs() {
     # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the
     # destination for the rpms
     export RPM_BUILD_ROOT=$TOPDIR
-    SPLZFSVER=${SPLZFSVER:-0.6.1}
-    SPLZFSTAG=${SPLZFSTAG:-lustre-zfs}
+    SPLZFSVER=${SPLZFSVER:-0.6.2}
+    SPLZFSTAG=${SPLZFSTAG:-upstream-master}
 
     # The files expect a kver to be set to the kernel version .
     local kver=$(find_linux_release)