From fea4ddfdaafbda43260c05d676b59d34f650ab4b Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Tue, 22 Mar 2022 08:56:44 -0500 Subject: [PATCH] EX-5011 lipe: fixup lipe.spec.in python macros Update the python macros in lipe.spec.in to support CentOS 8 builds of the lipe RPMs. Test-Parameters: trivial Signed-off-by: John L. Hammond Change-Id: Id910f00a672c4256089fe71d6a98171c1bbb3dd4 Reviewed-on: https://review.whamcloud.com/46891 Tested-by: jenkins Reviewed-by: Alexandre Ioffe Reviewed-by: Jian Yu Tested-by: Maloo --- lipe/lipe.spec.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lipe/lipe.spec.in b/lipe/lipe.spec.in index 3cc3485..bc58789 100644 --- a/lipe/lipe.spec.in +++ b/lipe/lipe.spec.in @@ -25,8 +25,7 @@ Prefix: %{_prefix} %define lipe_site_dir %{guile_site_dir}/lipe %define lipe_site_ccache_dir %{guile_site_ccache_dir}/lipe -%define __python %{_bindir}/python2 - +%{!?__python2: %global __python2 /usr/bin/python2} %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Release: @LIPE_RELEASE@%{?dist} @@ -189,7 +188,7 @@ cp \ src/lpcc_purge \ $RPM_BUILD_ROOT%{_bindir} -cp -a pylustre $RPM_BUILD_ROOT%{python_sitelib} +cp -a pylustre $RPM_BUILD_ROOT%{python2_sitelib} cp -a \ lpcc.conf \ $RPM_BUILD_ROOT%{_sysconfdir} @@ -234,8 +233,8 @@ mkdir -p $RPM_BUILD_ROOT%{ddntoolsdir}/ install -m 0755 scripts/*.sh $RPM_BUILD_ROOT%{ddntoolsdir}/ %endif # hotpool -cp -a pylipe $RPM_BUILD_ROOT%{python_sitelib} -cp -a pyloris $RPM_BUILD_ROOT%{python_sitelib} +cp -a pylipe $RPM_BUILD_ROOT%{python2_sitelib} +cp -a pyloris $RPM_BUILD_ROOT%{python2_sitelib} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} cp -a \ example_configs/lipe/lipe_launch.json \ -- 1.8.3.1