Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1445 fid: start ptlrpc service for OST FID
[fs/lustre-release.git]
/
lustre.spec.in
diff --git
a/lustre.spec.in
b/lustre.spec.in
index
1e50a00
..
44f085f
100644
(file)
--- a/
lustre.spec.in
+++ b/
lustre.spec.in
@@
-208,6
+208,11
@@
elif [ -e ${llog_base}.o ]; then
cp ${llog_base}.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre
fi
cp ${llog_base}.o $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates/kernel/fs/lustre
fi
+# The .ha_v2 extension identifies the heartbeat resource agent as using
+# legacy syntax. Install a compatibility symlink to avoid conflicts when
+# newer-style agents are added.
+ln -s Lustre.ha_v2 $RPM_BUILD_ROOT/etc/ha.d/resource.d/Lustre
+
# Create the pristine source directory.
cd $RPM_BUILD_DIR/lustre-%{version}
mkdir -p $RPM_BUILD_ROOT/usr/src
# Create the pristine source directory.
cd $RPM_BUILD_DIR/lustre-%{version}
mkdir -p $RPM_BUILD_ROOT/usr/src
@@
-237,9
+242,10
@@
cat >lustre.files <<EOF
%attr(-, root, root) %{_sysconfdir}/init.d/lnet
%attr(-, root, root) %{_sysconfdir}/init.d/lustre
%attr(-, root, root) %{_sysconfdir}/init.d/lnet
%attr(-, root, root) %{_sysconfdir}/init.d/lustre
-%attr(-, root, root) %{_sysconfdir}/ldev.conf
+%attr(-, root, root) %
config(noreplace) %
{_sysconfdir}/ldev.conf
%attr(-, root, root) %{_sysconfdir}/sysconfig/lustre
%attr(-, root, root) %{_libexecdir}/lustre/haconfig
%attr(-, root, root) %{_sysconfdir}/sysconfig/lustre
%attr(-, root, root) %{_libexecdir}/lustre/haconfig
+%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre.ha_v2
%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre
EOF
%attr(-, root, root) %{_sysconfdir}/ha.d/resource.d/Lustre
EOF
@@
-286,6
+292,10
@@
pushd $RPM_BUILD_ROOT >/dev/null
find lib/modules/%{kversion}/updates -type f | awk "!/(ZZZZZZZZZZ$modules_excludes)/ {print \"%attr(-, root, root) /\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files
popd >/dev/null
find lib/modules/%{kversion}/updates -type f | awk "!/(ZZZZZZZZZZ$modules_excludes)/ {print \"%attr(-, root, root) /\"\$0}" >>$RPM_BUILD_DIR/lustre-%{version}/lustre-modules.files
popd >/dev/null
+# mark modules executable for find-debuginfo.sh
+find $RPM_BUILD_ROOT/lib/modules/%{kversion}/updates -name "*.ko" -type f | \
+ xargs --no-run-if-empty chmod u+x
+
%files -f lustre.files
%files modules -f lustre-modules.files
%files -f lustre.files
%files modules -f lustre-modules.files