From 4c3c2f77bec38f7d32d4b318bed215c95bdd07fb Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Fri, 10 Sep 2021 20:53:01 -0700 Subject: [PATCH] EX-3780 lipe: clean up specfile Clean up specfile error due to previous merge Change-Id: I1dc33310027286860c446b9eb0cc01c16b2c5407 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/44891 Reviewed-by: Andreas Dilger Tested-by: jenkins --- lipe/Makefile.am | 2 +- lipe/lipe.spec.in | 31 ------------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/lipe/Makefile.am b/lipe/Makefile.am index 3ffd7b7..20733d1 100644 --- a/lipe/Makefile.am +++ b/lipe/Makefile.am @@ -79,7 +79,7 @@ EXTRA_DIST= \ .pylintrc PYLTEST_FILES = $(wildcard pyltest/*.py) -PYTHON_LIB_FILES = $(wildcard pyclownfish/*.py pylustre/*.py pyloris/*.py +PYTHON_LIB_FILES = $(wildcard pyclownfish/*.py pylustre/*.py pyloris/*.py) PYTHON_LIB_FILES += $(PYLTEST_FILES) PYTHON_FILES = $(PYTHON_LIB_FILES) $(PYTHON_COMMANDS) PYTHON_CHECKS = $(PYTHON_FILES:%=%.python_checked) diff --git a/lipe/lipe.spec.in b/lipe/lipe.spec.in index c7027ed..f53e70f 100644 --- a/lipe/lipe.spec.in +++ b/lipe/lipe.spec.in @@ -242,21 +242,11 @@ mkdir -p $RPM_BUILD_ROOT%{ddntoolsdir}/ install -m 0755 scripts/*.sh $RPM_BUILD_ROOT%{ddntoolsdir}/ %endif -<<<<<<< HEAD -cp -a pyclownfish $RPM_BUILD_ROOT%{python2_sitelib} -cp -a pylhsm $RPM_BUILD_ROOT%{python2_sitelib} -cp -a pylipe $RPM_BUILD_ROOT%{python2_sitelib} -cp -a pyloris $RPM_BUILD_ROOT%{python2_sitelib} -cp -a pylustre $RPM_BUILD_ROOT%{python2_sitelib} -cp -a pyltest $RPM_BUILD_ROOT%{python2_sitelib} -======= cp -a pyclownfish $RPM_BUILD_ROOT%{python_sitelib} cp -a pylipe $RPM_BUILD_ROOT%{python_sitelib} cp -a pyloris $RPM_BUILD_ROOT%{python_sitelib} -cp -a pylpcc $RPM_BUILD_ROOT%{python_sitelib} cp -a pylustre $RPM_BUILD_ROOT%{python_sitelib} cp -a pyltest $RPM_BUILD_ROOT%{python_sitelib} ->>>>>>> d4e8316dafcd4c3cdb5092dc6f2a857dc28065fa mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} cp -a \ example_configs/clownfish/seperate_mgs/clownfish.conf \ @@ -359,27 +349,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/lpcc-status.8* %{_mandir}/man5/lpcc.conf.5* - - -<<<<<<< HEAD -%files hsm -%defattr(-,root,root) -%{python2_sitelib}/pylhsm -%{_bindir}/lipe_hsm_remover -%{_bindir}/lipe_hsm_check -%{_bindir}/lipe_hsm_copytool -%{_bindir}/lipe_copytool_manager -%{_bindir}/lipe_test_copytool -%config(noreplace) %{_sysconfdir}/lipe_copytool_manager.conf -%if %{with systemd} - %{_unitdir}/lipe_copytool_manager.service -%else - %{_sysconfdir}/rc.d/init.d/lipe_copytool_manager -%endif -%{_libdir}/lhsm_tests - -======= ->>>>>>> d4e8316dafcd4c3cdb5092dc6f2a857dc28065fa %files server %defattr(-,root,root) %{_bindir}/ext4_inode2path -- 1.8.3.1