From da2a3375ef6a0b610dd03dbf323df8fbb071d8ec Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Mon, 12 Dec 2022 16:20:32 +1100 Subject: [PATCH] LU-16382 spec: specify all directories. All directories added by the package should be explicitly specified. This allows rpm to know which package owns which directories, so it knows when to safely remove them. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: I0ed03ca09f57587d19cb350777f2ece1ed303c7e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49370 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: xinliang Reviewed-by: jsimmons Reviewed-by: Oleg Drokin --- lustre.spec.in | 9 +++++++++ lustre/scripts/lc_common | 0 rpm/kmp-lustre-osd-ldiskfs.files | 2 ++ rpm/kmp-lustre-osd-zfs.files | 2 ++ rpm/kmp-lustre-tests.files | 2 ++ rpm/kmp-lustre.files | 2 ++ 6 files changed, 17 insertions(+) mode change 100644 => 100755 lustre/scripts/lc_common diff --git a/lustre.spec.in b/lustre.spec.in index 05547e4..3109e71 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -648,6 +648,8 @@ fi # legacy syntax. Install a compatibility symlink to avoid conflicts when # newer-style agents are added. ln -s Lustre.ha_v2 $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/Lustre +echo '%dir %{_sysconfdir}/ha.d' >>lustre.files +echo '%dir %{_sysconfdir}/ha.d/resource.d' >>lustre.files echo '%{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2' >>lustre.files echo '%{_sysconfdir}/ha.d/resource.d/Lustre' >>lustre.files %endif @@ -723,6 +725,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/liblustreapi.la %endif # mpi %endif +echo '%dir %{_libdir}/lustre' >>lustre-tests.files +echo '%dir %{_libdir}/lustre/tests' >>lustre-tests.files echo '%{_libdir}/lustre/tests/*' >>lustre-tests.files echo '%{_bindir}/mcreate' >>lustre-tests.files echo '%{_bindir}/munlink' >>lustre-tests.files @@ -771,6 +775,7 @@ echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files %endif %if %{with lustre_utils} %if %{with servers} +%dir %{_libexecdir}/lustre %{_libexecdir}/lustre/lc_common %{_libexecdir}/lustre/haconfig %{_bindir}/lustre_req_history @@ -819,6 +824,7 @@ echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files %if %{with lustre_utils} %files osd-ldiskfs-mount %defattr(-,root,root) +%dir %{_libdir}/@PACKAGE@ %{_libdir}/@PACKAGE@/mount_osd_ldiskfs.so %endif %endif @@ -829,6 +835,7 @@ echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files %if %{with lustre_utils} %files osd-zfs-mount %defattr(-,root,root) +%dir %{_libdir}/@PACKAGE@ %{_libdir}/@PACKAGE@/mount_osd_zfs.so %{_sysconfdir}/zfs/zed.d/* %endif @@ -841,6 +848,8 @@ echo '%{_libdir}/lustre/tests/lutf/*' >>lustre-tests.files %if %{with servers} %files resource-agents %defattr(0755,root,root) +%dir %{_prefix}/lib/ocf +%dir %{_prefix}/lib/ocf/resource.d %{_prefix}/lib/ocf/resource.d/lustre/ %endif diff --git a/lustre/scripts/lc_common b/lustre/scripts/lc_common old mode 100644 new mode 100755 diff --git a/rpm/kmp-lustre-osd-ldiskfs.files b/rpm/kmp-lustre-osd-ldiskfs.files index 47bcee1..ffd12c1 100644 --- a/rpm/kmp-lustre-osd-ldiskfs.files +++ b/rpm/kmp-lustre-osd-ldiskfs.files @@ -1,3 +1,5 @@ %defattr(-,root,root) +%dir %{modules_fs_path}/%{lustre_name}-osd-ldiskfs +%dir %{modules_fs_path}/%{lustre_name}-osd-ldiskfs/fs %{modules_fs_path}/%{lustre_name}-osd-ldiskfs/fs/ldiskfs.ko %{modules_fs_path}/%{lustre_name}-osd-ldiskfs/fs/osd_ldiskfs.ko diff --git a/rpm/kmp-lustre-osd-zfs.files b/rpm/kmp-lustre-osd-zfs.files index 0ac2677..737eeee 100644 --- a/rpm/kmp-lustre-osd-zfs.files +++ b/rpm/kmp-lustre-osd-zfs.files @@ -1,2 +1,4 @@ %defattr(-,root,root) +%dir %{modules_fs_path}/%{lustre_name}-osd-zfs +%dir %{modules_fs_path}/%{lustre_name}-osd-zfs/fs %{modules_fs_path}/%{lustre_name}-osd-zfs/fs/osd_zfs.ko diff --git a/rpm/kmp-lustre-tests.files b/rpm/kmp-lustre-tests.files index f62b46f..fd7aed8 100644 --- a/rpm/kmp-lustre-tests.files +++ b/rpm/kmp-lustre-tests.files @@ -1 +1,3 @@ +%dir %{modules_fs_path}/%{lustre_name}-tests +%dir %{modules_fs_path}/%{lustre_name}-tests/fs %{modules_fs_path}/%{lustre_name}-tests/fs/llog_test.ko diff --git a/rpm/kmp-lustre.files b/rpm/kmp-lustre.files index 62e39d0..3ded0c4 100644 --- a/rpm/kmp-lustre.files +++ b/rpm/kmp-lustre.files @@ -1,4 +1,6 @@ %defattr(-,root,root) +%dir %{modules_fs_path} +%dir %{modules_fs_path}/%{lustre_name} %{modules_fs_path}/%{lustre_name}/* %doc COPYING %doc ChangeLog-lustre -- 1.8.3.1