From a619dc940784cc610f4148e51feed5d52c499413 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Mon, 11 Mar 2019 14:10:30 -0400 Subject: [PATCH] LU-9812 spec: Fail rpmbuild if with servers but unconfigured Fail rpm build if "--with servers" used, but servers are not being built after ./configure. This would happen if --without ldiskfs but zfs isn't found and thus configure turns off server support. Test-Parameters: trivial Change-Id: I57b07c7b7c5ad5bd73165238969ad3b9d2f3a5ab Signed-off-by: Nathaniel Clark Reviewed-on: https://review.whamcloud.com/28282 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Olaf Faaland-LLNL Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lustre.spec.in b/lustre.spec.in index 24f18f0..345f726 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -458,6 +458,13 @@ fi --with-linux-obj=%{kobjdir} \ --with-kmp-moddir=%{kmoddir}/%{name} +%if %{with servers} +if ! grep -q define[[:space:]]*HAVE_SERVER_SUPPORT config.h 2> /dev/null; then + echo "Error: Server Support configured but not found" + false +fi +%endif + make %{?_smp_mflags} -s %{?make_args} %install -- 1.8.3.1