From d24545ea67a03f67ebfc9fe7263ce396416012d9 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Thu, 5 Jan 2012 09:12:29 -0800 Subject: [PATCH] LU-955 build: fix bad lustre-backend-fs dependency Fix an incorrect RPM package dependency if Lustre RPMs are built with "make rpms" with client only Signed-off-by: Minh Diep Change-Id: Ib8691a37fc230cc63b7aca48bc5146a67e10a2f0 --- autoMakefile.am | 4 ++++ build/autoMakefile.am.toplevel | 3 +++ 2 files changed, 7 insertions(+) diff --git a/autoMakefile.am b/autoMakefile.am index ccf30fc..de00088 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -10,6 +10,10 @@ endif @TESTS_TRUE@BUILD_TESTS = true @TESTS_FALSE@BUILD_TESTS = false +@SERVER_TRUE@BUILD_SERVER = true +@SERVER_FALSE@BUILD_SERVER = false +@CLIENT_TRUE@BUILD_CLIENT = true +@CLIENT_FALSE@BUILD_CLIENT = false include build/autoMakefile.am.toplevel diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel index 7abcd4e..bd4c1d9 100644 --- a/build/autoMakefile.am.toplevel +++ b/build/autoMakefile.am.toplevel @@ -118,6 +118,9 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile if ! $(BUILD_TESTS); then \ RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \ fi; \ + if ! $(BUILD_SERVER); then \ + RPMARGS="$$RPMARGS --define \"lustre_name lustre-client\""; \ + fi; \ echo "Building Lustre RPM with $$RPMARGS"; \ eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz -- 1.8.3.1