From 0ec338710ab5fc9031b2da5dd0d5d6d888733378 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Mon, 21 Feb 2022 08:31:20 -0600 Subject: [PATCH] EX-4015 lipe: add lipe-scan RPM Adding new dependencies to existing EXAScaler RPMs may create headaches when distributing hotfixes to existing installs. So move lipe_find3 and lipe_scan3 to a new RPM (lipe-scan). This also has the benefit of explicitly severing the new scanning tools from any python2 RPM or pip dependencies. Compile fid.scm and find.scm to (%site-ccache-dir)/lipe/. Test-Parameters: trivial testlist=sanity-lipe-find3 serverextra_install_params="--packages lipe-scan" Test-Parameters: trivial testlist=sanity-lipe-scan3 serverextra_install_params="--packages lipe-scan" facet=mds1 Signed-off-by: John L. Hammond Change-Id: Ifecb5ab1f399ba9be8cb395ded29d6394b13dc86 Reviewed-on: https://review.whamcloud.com/46572 Tested-by: jenkins Tested-by: Maloo --- lipe/lipe.spec.in | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/lipe/lipe.spec.in b/lipe/lipe.spec.in index cf122e6..fc5891e 100644 --- a/lipe/lipe.spec.in +++ b/lipe/lipe.spec.in @@ -20,6 +20,10 @@ Vendor: DataDirect Networks Inc. Prefix: %{_prefix} %define guile_site_dir %{_datadir}/guile/site/2.0 +%define guile_site_ccache_dir /usr/lib64/guile/2.0/site-ccache + +%define lipe_site_dir %{guile_site_dir}/lipe +%define lipe_site_ccache_dir %{guile_site_ccache_dir}/lipe %define __python %{_bindir}/python2 @@ -120,8 +124,27 @@ Group: Applications/System %description client Provides lipe tools run on lustre client. -%endif # server +%package scan +Summary: Third generation Lipe Scanners +Requires: lustre +Requires: e2fsprogs >= 1.42.13.wc6 +Group: Applications/System + +%description scan +Third generation scanners lipe_scan3 and lipe_find3. + +%post scan +echo '(compile-file "%{lipe_site_dir}/fid.scm" #:output-file "%{lipe_site_ccache_dir}/fid.go")' | +lipe_scan3 --script=/dev/stdin + +echo '(compile-file "%{lipe_site_dir}/find.scm" #:output-file "%{lipe_site_ccache_dir}/find.go")' | +lipe_scan3 --script=/dev/stdin + +%postun scan +rm -rf "%{lipe_site_ccache_dir}" + +%endif # server %prep %setup -q -n @PACKAGE@-%{version} @@ -320,6 +343,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/laudit.conf.5* %endif # laudit +%files scan +%defattr(-,root,root) +%{_bindir}/lipe_find3 +%{_bindir}/lipe_scan3 +%{guile_site_dir}/* + %files %defattr(-,root,root) %{_bindir}/ldsync @@ -329,13 +358,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/lipe_delete %{_bindir}/lipe_find %{_bindir}/lipe_find2 -%{_bindir}/lipe_find3 %{_bindir}/lipe_launch %{_bindir}/lipe_purge %{_bindir}/lipe_scan %{_bindir}/lipe_scan2 -%{_bindir}/lipe_scan3 -%{guile_site_dir}/* %{python2_sitelib}/pylipe %config(noreplace) %{_sysconfdir}/lipe_launch.json %{_mandir}/man1/lipe_scan.1* -- 1.8.3.1