From 4c6973e945830b78e97a713d5c885c35c672cf4d Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Wed, 18 Apr 2012 17:18:46 -0700 Subject: [PATCH] LU-1335 build: include lustre srpm in build Add a support for building lustre-*.src.rpm Signed-off-by: Minh Diep Change-Id: I301915c107e50ea5d1a3275ecc631f07aa2b78be Reviewed-on: http://review.whamcloud.com/2576 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Brian J. Murrell Reviewed-by: Andreas Dilger Reviewed-by: Johann Lombardi --- build/lbuild | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/lbuild b/build/lbuild index a050ff0..60e3351 100755 --- a/build/lbuild +++ b/build/lbuild @@ -901,6 +901,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 } @@ -1377,7 +1391,8 @@ build_rdac() { # note that we use an _, not a . before the spec on purpose. we are not # allowed to have more than one file with a .spec trailer in a tarball # that is supposed to be usable with rpmbuild - cp lustre/build/rdac_spec ${TOPDIR}/SPECS/rdac.spec || fatal 1 "Could not find rdac.spec in lustre/build" + cp lustre/build/rdac_spec ${TOPDIR}/SPECS/rdac.spec || + fatal 1 "Could not find rdac.spec in lustre/build" local targets arch for arch in $BUILD_ARCHS; do -- 1.8.3.1