X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Flbuild;h=3e4e0cd056a415789c5f51a374ea251bb1001d83;hp=93d62a59349f6d9941d4c6cb0aa01f534a28d405;hb=4198da9d8f2298742f22455d23799eec2dcb4fbb;hpb=4312bfd8ffc4ceb16043c044aa852de999b666dd diff --git a/build/lbuild b/build/lbuild index 93d62a5..3e4e0cd 100755 --- a/build/lbuild +++ b/build/lbuild @@ -369,7 +369,6 @@ download_srpm() { local target=$1 local srpm=$2 - # ~sigh~ the download site doesn't actually have these kernels echo "Downloading http://downloads.lustre.org/public/kernels/$target/old/$srpm..." if ! wget -nv "http://downloads.lustre.org/public/kernels/$target/old/$srpm" \ -O "$KERNELDIR/$srpm"; then @@ -659,8 +658,11 @@ build_lustre() { echo NORPM mode. Only compiling. fi + if $PATCHLESS; then + rpmbuildopt="$rpmbuildopt --define \"lustre_name lustre-client\"" + fi + $RPMBUILD $targets $rpmbuildopt ../lustre.spec \ - ${PATCHLESS:+--define "lustre_name lustre-client"} \ --define "_tmppath $TMPDIR" \ --define "_topdir $TOPDIR" || \ fatal 1 "Error building rpms for $BUILD_ARCHS."