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-2033 scrub: lookup server local files by name
[fs/lustre-release.git]
/
lustre.spec.in
diff --git
a/lustre.spec.in
b/lustre.spec.in
index
a2e52fd
..
ae67085
100644
(file)
--- a/
lustre.spec.in
+++ b/
lustre.spec.in
@@
-6,7
+6,7
@@
%{!?kobjdir: %define kobjdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux-obj=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; if [ "%kdir" = "/lib/modules/$kversion/source" ]; then echo "/lib/modules/$kversion/build"; else echo "%kdir"; fi; fi)}
# as an alternative to this implementation we could simply "make -C $kdir kernelversion"
%{!?kobjdir: %define kobjdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux-obj=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; if [ "%kdir" = "/lib/modules/$kversion/source" ]; then echo "/lib/modules/$kversion/build"; else echo "%kdir"; fi; fi)}
# as an alternative to this implementation we could simply "make -C $kdir kernelversion"
-%{!?kversion: %define kversion %(if test -s %kobjdir/include/
linux/utsrelease.h ; then LINUXRELEASEHEADER=utsrelease.h; else LINUXRELEASEHEADER=version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p' %kobjdir/include/linux/
$LINUXRELEASEHEADER)}
+%{!?kversion: %define kversion %(if test -s %kobjdir/include/
generated/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/generated/utsrelease.h ; elif test -s %kobjdir/include/linux/utsrelease.h ; then LINUXRELEASEHEADER=%kobjdir/include/linux/utsrelease.h ; else LINUXRELEASEHEADER=%kobjdir/include/linux/version.h; fi; sed -ne '/^#define UTS_RELEASE/s/.*"\\(.*\\)"$/\\1/p'
$LINUXRELEASEHEADER)}
%{!?downstream_release: %define downstream_release "@DOWNSTREAM_RELEASE@"}
%{!?downstream_release: %define downstream_release "@DOWNSTREAM_RELEASE@"}
@@
-225,6
+225,7
@@
cat >lustre.files <<EOF
%attr(-, root, root) %{_libdir}/libptlctl.a
%attr(-, root, root) %{_libdir}/liblustreapi.a
%attr(-, root, root) %{_libdir}/libptlctl.a
%attr(-, root, root) %{_libdir}/liblustreapi.a
+%attr(-, root, root) %{_libdir}/liblustreapi.so
%attr(-, root, root) /usr/include/lustre
%attr(-, root, root) /usr/include/libcfs
%attr(-, root, root) /usr/include/lustre
%attr(-, root, root) /usr/include/libcfs
@@
-251,7
+252,7
@@
if [ -f $RPM_BUILD_ROOT%{_libdir}/liblustre.so ] ; then
echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files
fi
echo '%attr(-, root, root) %{_libdir}/liblustre.so' >>lustre.files
fi
-if [ -f $RPM_BUILD_
DIR/lustre-%{version}/lustre/utils/libiam.c
] ; then
+if [ -f $RPM_BUILD_
ROOT%{_libdir}/libiam.a
] ; then
echo '%attr(-, root, root) %{_libdir}/libiam.a' >>lustre.files
fi
echo '%attr(-, root, root) %{_libdir}/libiam.a' >>lustre.files
fi