Whamcloud - gitweb
LU-12269 build: add value to definition of with_gss in spec 63/35163/3
authorBen Menadue <ben.menadue@anu.edu.au>
Tue, 11 Jun 2019 03:42:50 +0000 (20:42 -0700)
committerOleg Drokin <green@whamcloud.com>
Thu, 27 Jun 2019 21:46:30 +0000 (21:46 +0000)
rpmbuild currently fails when gss_keyring is enabled (which
happens automatically if the right packages are installed).
This is due to an ill-formed %define in lustre.spec.in that
doesn't include the value to set the macro do.

This patch updates this line to set the value to 1.

This patch is back-ported from the following one:
Lustre-commit: 5bdf89f0c13eab1513d11b2e1950fba31479535d
Lustre-change: https://review.whamcloud.com/34892

Signed-off-by: Ben Menadue <ben.menadue@anu.edu.au>
Change-Id: I2f52b19795091702622eb3b4c110f09eb80654db
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-on: https://review.whamcloud.com/35163
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre.spec.in

index a0cd0e4..8845593 100644 (file)
@@ -21,7 +21,7 @@
 # request gss_keyring we must enable gss core even if
 # the builder attempts to disable gss.
 %if %{with gss_keyring}
-    %define with_gss
+    %define with_gss 1
 %endif
 
 %if %{without servers}