From a585df5757b1140e264f177bfb53da3d91421863 Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Mon, 8 Nov 2010 19:20:49 +0800 Subject: [PATCH] b=24092 build src.rpm for lustre if requested Fix a bug where we were not building the lustre SRPM even if requested. i=wangyb i=cliff --- build/lbuild | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build/lbuild b/build/lbuild index fd97a12..f18a5a3 100755 --- a/build/lbuild +++ b/build/lbuild @@ -869,6 +869,20 @@ build_lustre() { --define "_topdir $TOPDIR" 2>&1 || \ fatal 1 "Error building rpms for $BUILD_ARCHS." + if $DO_SRC; then + if ! $RPMBUILD -ts "$LUSTRE" \ + ${is_patchless:+--define "lustre_name lustre-client"} \ + ${lustre_tests:+--define "build_lustre_tests 0"} \ + ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \ + --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \ + --define "kdir $linux" \ + ${linuxobj:+--define "kobjdir $linuxobj"} \ + --define "_tmppath $TMPDIR" \ + --define "_topdir $TOPDIR" 2>&1; then + popd + return 255 + fi + fi popd >/dev/null } -- 1.8.3.1