From 58548b6f5faaab0b2c8f9429e43dd930ce52da54 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Fri, 3 May 2013 10:40:06 -0700 Subject: [PATCH] LU-3232 build: Move fsfilt_ldiskfs.ko into lustre-osd-ldiskfs The fsfilt_ldiskfs.ko module depends on symbols in osd_ldiskfs.ko and ldiskfs. However, osd_ldiskfs.ko is only part of the optional package lustre-osd-ldiskfs, while fsfilt-ldiskfs.ko is in the non-optional package lustre-modules. This means that a person using only the lustre-osd-zfs osd will see a screen full of warnings about missing ldiskfs-related symbols. We remedy this problem by moving the fsfilt-ldiskfs.ko into the lustre-osd-ldiskfs rpm. Change-Id: I631a98dd56c7d4df69266e4f922f949132774d84 Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/6260 Reviewed-by: Faccini Bruno Reviewed-by: Nathaniel Clark Tested-by: Hudson Tested-by: Maloo Reviewed-by: Andreas Dilger Tested-by: Andreas Dilger --- lustre.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lustre.spec.in b/lustre.spec.in index 89d556b..a1d886e 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -363,6 +363,7 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty %exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/llog_test.ko %endif %if %{build_lustre_osd_ldiskfs} +%exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko %exclude %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko %endif %if %{build_lustre_osd_zfs} @@ -377,6 +378,7 @@ find $RPM_BUILD_ROOT%{?rootdir}/lib/modules/%{kversion}/updates -name "*.ko" -ty %if %{build_lustre_osd_ldiskfs} %files osd-ldiskfs +%attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/fsfilt_ldiskfs.ko %attr(-, root, root) %{?rootdir}/lib/modules/%{kversion}/updates/kernel/fs/lustre/osd_ldiskfs.ko %if %{defined rpm_post_base} %attr(0555, root, root) %{rpm_post_base}-osd-ldiskfs.sh -- 1.8.3.1