From: Shaun Tancheff Date: Sat, 6 Jan 2024 15:13:27 +0000 (+0700) Subject: LU-17398 build: quash rpmbuild false warning X-Git-Tag: 2.15.61~102 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F53604%2F5;p=fs%2Flustre-release.git LU-17398 build: quash rpmbuild false warning Rewrite comment so %() is escaped and does not generate a false and misleaning warning during build: sh: -c: line 0: syntax error near unexpected token `)' sh: -c: line 0: `)' warning: Macro expanded in comment on line 261: %() Test-Parameters: trivial Fixes: 67cd54d05d ("LU-16967 build: Separate lnet LND rpm packaging") Signed-off-by: Shaun Tancheff Change-Id: I94fa0da88a5c7f64461cd8fc3cea343a7a087413 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53604 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: James Simmons Reviewed-by: Andreas Dilger --- diff --git a/lustre.spec.in b/lustre.spec.in index a08add8..531c978 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -256,12 +256,12 @@ BuildRequires: pkg-config BuildRequires: krb5-devel openssl-devel %endif %if %{with lustre_modules} -# abuild (auto-build) used by SUSE Open Build Service -# need kernel-source as a build requirement, but the code -# which extracts these requirements don't understand %() -# and treats all such as failures. So the following dance -# Allows the requirements to be seen by abuild, but ignored -# by lbuild. +# abuild (auto-build) used by SUSE Open Build Service needs kernel-source as +# a build requirement, but the code which extracts these requirements does not +# understand the percent-open-close-paren construct aka %%() +# [NOTE: a percent abovie is doubled to avoid yet another rpmbuild warning] +# such occurances as failures. So the following dance allows the requirements +# to be seen by abuild, but ignored by lbuild. %if "%(echo $USER)" != "abuild" %else BuildRequires: kernel-source