add RHBUILD to targets and spec to distinguish files that come from using a redhat...

[fs/lustre-release.git] / lustre / scripts / lmake

diff --git a/lustre/scripts/lmake b/lustre/scripts/lmake
index 3a851a8..a79f89b 100755 (executable)
--- a/lustre/scripts/lmake
+++ b/lustre/scripts/lmake
@@ -219,7 +219,6 @@ load_target()
     else
        EXTRA_VERSION="${EXTRA_VERSION}_lustre.$(get_lustre_version)"
     fi
-    EXTRA_VERSION=${EXTRA_VERSION//-/_}
 }
 
 tarflags()
@@ -328,7 +327,7 @@ build_lustre()
 {
     (( $BUILD_LUSTRE )) || return 0
     pushd "$TOPDIR" >/dev/null
-    make -j $JOBS -s
+    make -j $JOBS -s || fatal 1 "Error building Lustre."
     popd >/dev/null
 }
 
@@ -359,8 +358,8 @@ install_kernel()
            mkdir -p "$DESTDIR/boot/efi/redhat"
            install -m 755 vmlinux "$DESTDIR/boot/efi/redhat/vmlinux-${FULL_VERSION}"
            install -m 755 vmlinuz "$DESTDIR/boot/efi/redhat/vmlinuz-${FULL_VERSION}"
-           ln -sf "efi/vmlinux-${FULL_VERSION}" "$DESTDIR/boot/vmlinux-${FULL_VERSION}"
-           ln -sf "efi/vmlinuz-${FULL_VERSION}" "$DESTDIR/boot/vmlinuz-${FULL_VERSION}"
+           ln -sf "efi/redhat/vmlinux-${FULL_VERSION}" "$DESTDIR/boot/vmlinux-${FULL_VERSION}"
+           ln -sf "efi/redhat/vmlinuz-${FULL_VERSION}" "$DESTDIR/boot/vmlinuz-${FULL_VERSION}"
            ;;
        *)
            cp vmlinuz "$DESTDIR/boot/vmlinuz-${FULL_VERSION}"