Whamcloud - gitweb
LU-17029 lustre.spec.in: match rpm macro openEuler for openEuler Linux 54/51954/4
authorXinliang Liu <xinliang.liu@linaro.org>
Mon, 7 Aug 2023 10:18:49 +0000 (10:18 +0000)
committerOleg Drokin <green@whamcloud.com>
Sun, 4 Feb 2024 08:27:26 +0000 (08:27 +0000)
So that it can handle openEuler derived OSes, because different
derived OS has different vendor name, like KylinOS's vendor name
is Kylin.

Change-Id: I12ceda5bf9d1f17a75d4adddbad292fd1ae9967b
Test-Parameters: trivial
Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51954
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre.spec.in

index 1c00217..25a256d 100644 (file)
 # 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" || "%{_vendor}" == "openEuler"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora" || 0%{?openEuler}
        %global requires_kmod_name kmod-%{lustre_name}
        %global requires_kmod_osd_zfs_name kmod-%{lustre_name}-osd-zfs
        %if %{with lustre_tests}
 %endif
 
 # openEuler comes with systemd
-%if "%{_vendor}" == "openEuler"
+%if 0%{?openEuler}
 %define with_systemd 1
 %endif
 
@@ -254,7 +254,7 @@ BuildRequires: pkgconfig
 Suggests: bash-completion
 %endif
 %else
-%if "%{_vendor}" == "openEuler"
+%if 0%{?openEuler}
 BuildRequires: openEuler-rpm-config
 %if %{with ldiskfs}
 BuildRequires: kernel-debugsource
@@ -285,7 +285,7 @@ Provides: lustre-server = %{version}-%{release}
 %endif
 Obsoletes: lustre-client < %{version}
 Provides: lustre-client = %{version}-%{release}
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora" || "%{_vendor}" == "openEuler"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "fedora" || 0%{?openEuler}
 #suse don't support selinux
 BuildRequires: pkgconfig(libselinux)
 %endif
@@ -295,14 +295,14 @@ BuildRequires: pkgconfig(libselinux)
 BuildRequires: mlnx-ofa_kernel-devel
 %endif
 %if %{with multiple_lnds}
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "openEuler"
+%if "%{_vendor}" == "redhat" || 0%{?openEuler}
 Requires: kmod-mlnx-ofa_kernel
 %else
 Requires: mlnx-ofa_kernel-kmp
 %endif
 %endif
 %endif
-%if 0%{?rhel} >= 8 || "%{_vendor}" == "openEuler"
+%if 0%{?rhel} >= 8 || 0%{?openEuler}
 BuildRequires: kernel-rpm-macros
 %endif
 %if 0%{?suse_version} >= 1530
@@ -438,7 +438,7 @@ Requires: %{name} = %{version}, lustre-iokit
 Requires: %{name} = %{version}
 %endif
 Requires: lustre-devel = %{version}
-%if 0%{?rhel} >= 8 || 0%{?suse_version} >= 1500
+%if 0%{?rhel} >= 8 || 0%{?suse_version} >= 1500 || 0%{?openEuler}
 Requires: python3 >= 3.6.0, python3-PyYAML
 %endif
 %if %{with lustre_modules}
@@ -461,7 +461,7 @@ Suggests: pdsh, clush
 BuildRequires: mpich-devel
 %endif
 %if "%{mpi_name}" == "openmpi"
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "openEuler" || 0%{?suse_version} < 1500
+%if "%{_vendor}" == "redhat" || 0%{?openEuler} || 0%{?suse_version} < 1500
 BuildRequires: openmpi-devel
 %else
 BuildRequires: openmpi2-devel
@@ -758,7 +758,7 @@ echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files
 echo '%{_unitdir}/lnet.service' >>lustre.files
 %endif
 
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "openEuler"
+%if "%{_vendor}" == "redhat" || 0%{?openEuler}
 # The following scripts are Red Hat specific
 %if %{with servers}
 echo '%{_sysconfdir}/init.d/lustre' >>lustre.files