From 597a6bf9e085150dd57eb727859b114deb8979cb Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 7 Feb 2022 10:21:47 -0800 Subject: [PATCH] LU-15521 spec: fix bare words error with rpm 4.16 RPM 4.16 removed support for bare words in expressions (eg a == b needs to be "a" == "b" now). The change is backward compatible. More changes are in: https://rpm.org/wiki/Releases/4.16.0 This patch accommodates the above change and fixes more errors/warnings: - E: specfile-error error: bare words are no longer supported, please use "...": redhat=="redhat" || redhat=="fedora" - E: specfile-error warning: extra tokens at the end of %else directive in line 140: %else #for Suse - W: macro-in-comment %optflags - W: macro-in-comment %{name} Test-Parameters: trivial Change-Id: I725c47f62be7762a89e5919fd2865e2fb2ced407 Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/46471 Tested-by: jenkins Reviewed-by: Nathaniel Clark Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lustre-dkms.spec.in | 5 +++-- lustre.spec.in | 44 +++++++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in index 9ced9e6..c749b08 100644 --- a/lustre-dkms.spec.in +++ b/lustre-dkms.spec.in @@ -28,10 +28,11 @@ %define lustre_name @PACKAGE@-client %endif -%if %{_vendor}=="redhat" || %{_vendor}=="fedora" +%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora" %global kmod_name kmod-%{lustre_name} %define mkconf_options %{nil} -%else #for Suse / Ubuntu +#for Suse / Ubuntu +%else %global kmod_name %{lustre_name}-kmp %define mkconf_options "-k updates" %endif diff --git a/lustre.spec.in b/lustre.spec.in index b67b4a2..2777570 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -130,14 +130,15 @@ # requires want to set a version including epoch %global krequires %(echo %{kver} | sed -e 's/\.x86_64$//' -e 's/\.i[3456]86$//' -e 's/-smp$//' -e 's/-bigsmp$//' -e 's/[-.]ppc64$//' -e 's/\.aarch64$//' -e 's/-default$//' -e 's/-%{_flavor}//') -%if %{_vendor}=="redhat" || %{_vendor}=="fedora" +%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora" %global requires_kmod_name kmod-%{lustre_name} %global requires_kmod_osd_zfs_name kmod-%{lustre_name}-osd-zfs %if %{with lustre_tests} %global requires_kmod_tests_name kmod-%{lustre_name}-tests %endif %global requires_kmod_version %{version} -%else #for Suse +#for Suse +%else %global requires_kmod_name %{lustre_name}-kmp %global requires_kmod_osd_zfs_name %{lustre_name}-osd-zfs-kmp %if %{with lustre_tests} @@ -194,7 +195,7 @@ Requires: python3 >= 3.6.0 BuildRequires: python3-devel >= 3.6.0, swig %endif BuildRequires: libtool libyaml-devel zlib-devel libnl3-devel -%if %{_vendor}=="redhat" +%if "%{_vendor}" == "redhat" BuildRequires: redhat-rpm-config BuildRequires: pkgconfig %else @@ -211,14 +212,14 @@ Provides: lustre-server = %{version}-%{release} %endif Obsoletes: lustre-client < %{version} Provides: lustre-client = %{version}-%{release} -%if %{_vendor}=="redhat" || %{_vendor}=="fedora" +%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora" #suse don't support selinux BuildRequires: libselinux-devel %endif %if %{with lustre_modules} %if %{with mofed} BuildRequires: mlnx-ofa_kernel-devel -%if %{_vendor} == "redhat" +%if "%{_vendor}" == "redhat" Requires: kmod-mlnx-ofa_kernel %else Requires: mlnx-ofa_kernel-kmp @@ -230,7 +231,7 @@ BuildRequires: kernel-rpm-macros BuildRequires: %kernel_module_package_buildreqs # need to provide a /usr/lib/${uname -r)/build dir BuildRequires: kernel -%if %{_vendor}=="redhat" +%if "%{_vendor}" == "redhat" %if %{with kabi} BuildRequires: kernel-abi-whitelists %endif @@ -286,8 +287,10 @@ Group: System Environment/Kernel %description osd-ldiskfs-mount LDISKFS hooks for mount/mkfs into a dynamic library. -%endif # with lustre_utils -%endif # with ldiskfs +# with lustre_utils +%endif +# with ldiskfs +%endif %if %{with zfs} %kernel_module_package -n %{name}-osd-zfs -p %SOURCE5 -f %SOURCE6 %{_flavor} @@ -304,10 +307,12 @@ Group: System Environment/Kernel %description osd-zfs-mount ZFS hooks for mount/mkfs into a dynamic library. -%endif # with lustre_utils -%endif # with zfs - -%endif # with lustre_modules +# with lustre_utils +%endif +# with zfs +%endif +# with lustre_modules +%endif %if %{with servers} %package resource-agents @@ -356,11 +361,11 @@ Requires: python3 >= 3.6.0 %endif Requires: attr, rsync, perl, lsof, /usr/bin/getconf %if %{with mpi} -%if %{mpi_name} == "mpich" +%if "%{mpi_name}" == "mpich" BuildRequires: mpich-devel %endif -%if %{mpi_name} == "openmpi" -%if %{_vendor} == "redhat" || 0%{?suse_version} < 1500 +%if "%{mpi_name}" == "openmpi" +%if "%{_vendor}" == "redhat" || 0%{?suse_version} < 1500 BuildRequires: openmpi-devel %else BuildRequires: openmpi2-devel @@ -443,7 +448,7 @@ export UTILS_CFLAGS="${UTILS_CFLAGS} -D__SANE_USERSPACE_TYPES__=1" %endif # Disable any hardening or annotation since this doesn't make sense for -# kernel code, and reset %optflags so that the vendor's overzealous flags don't +# kernel code, and reset "optflags" so that the vendor's overzealous flags don't # create build failures. %define optflags -g -O2 -Werror %undefine _annotated_build @@ -470,7 +475,7 @@ fi # string in it which we don't want word splitted by the shell # also remove (build|host|target) options because they will be specified # inside $CONFIGURE_ARGS -# kmod tools/scripts require %{name} directory with kernel modules +# kmod tools/scripts require "name" directory with kernel modules %define eval_configure %(echo '%configure' | sed -e 's#\./configure#eval ./configure#' -e 's/--\\(build\\|host\\|target\\)=[^ ][^ ]* //g') %{?_openmpi_load} @@ -566,7 +571,7 @@ echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files echo '%{_unitdir}/lnet.service' >>lustre.files %endif -%if %{_vendor}=="redhat" +%if "%{_vendor}" == "redhat" # The following scripts are Red Hat specific %if %{with servers} echo '%{_sysconfdir}/init.d/lustre' >>lustre.files @@ -731,7 +736,8 @@ echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files %endif %endif -%endif # with lustre_modules +# with lustre_modules +%endif %if %{with servers} %files resource-agents -- 1.8.3.1