Update b_bug1414 from HEAD (20040317_1808)

diff --git a/lustre/scripts/lbuild b/lustre/scripts/lbuild
index 0e682c5..2c76308 100755 (executable)
--- a/lustre/scripts/lbuild
+++ b/lustre/scripts/lbuild
@@ -308,6 +308,7 @@ prep_build()
        -e "s/@JENSEN_ARCHS@/$BOOT_ARCHS/g" \
        -e "s/@SMP_ARCHS@/$SMP_ARCHS/g" \
        -e "s/@UP_ARCHS@/$UP_ARCHS/g" \
+       -e "s/@RHBUILD@/$RHBUILD/g" \
        < $TOPDIR/lustre/scripts/lustre-kernel-2.4.spec.in \
        > lustre-kernel-2.4.spec
     [ -d SRPMS ] || mkdir SRPMS
@@ -337,11 +338,11 @@ build()
     done
 
     rpmbuild $targets -bb lustre-kernel-2.4.spec \
-       --define "_topdir $TOPDIR" \
+       --define "_topdir $TOPDIR" || \
        fatal 1 "Error building rpms for $arch."
 
     (( $DO_SRC )) && rpmbuild -bs lustre-kernel-2.4.spec \
-       --define "_topdir $TOPDIR" \
+       --define "_topdir $TOPDIR" || \
        fatal 1 "Error building .src.rpm."
 }
 

diff --git a/lustre/scripts/lmake b/lustre/scripts/lmake
index c114961..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()
@@ -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}"