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
New tag 2.3.59
[fs/lustre-release.git]
/
lustre.spec.in
diff --git
a/lustre.spec.in
b/lustre.spec.in
index
afbc3c2
..
44f085f
100644
(file)
--- a/
lustre.spec.in
+++ b/
lustre.spec.in
@@
-1,24
+1,24
@@
# lustre.spec
# lustre.spec
-%{!?version: %
define
version @VERSION@}
-%{!?kver: %
define
kver ""}
-%{!?kdir: %
define
kdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; echo "/lib/modules/$kversion/source"; fi)}
+%{!?version: %
global
version @VERSION@}
+%{!?kver: %
global
kver ""}
+%{!?kdir: %
global
kdir %(dir=$(echo "%configure_args" | sed -ne 's/.*--with-linux=\\([^ ][^ ]*\\).*$/\\1/p'); if [ -n "$dir" ]; then echo "$dir"; else if [ -n "%kver" ]; then kversion="%kver"; else kversion="$(uname -r)"; fi; echo "/lib/modules/$kversion/source"; fi)}
-%{!?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)}
+%{!?kobjdir: %
global
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"
# as an alternative to this implementation we could simply "make -C $kdir kernelversion"
-%{!?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)}
+%{!?kversion: %
global
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: %
global
downstream_release "@DOWNSTREAM_RELEASE@"}
%define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi)
%define buildid %(if [ -n "@BUILDID@" ]; then echo "_@BUILDID@"; fi)
-%{!?myrelease: %
define
myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')}
+%{!?myrelease: %
global
myrelease %(if [ -n "%downstream_release" ]; then echo -n "%{downstream_release}_"; fi; echo %kversion | tr '-' '_')}
# always append the buildid, even when the caller defines %release
%define fullrelease %{myrelease}%{buildid}
# always append the buildid, even when the caller defines %release
%define fullrelease %{myrelease}%{buildid}
-%{!?lustre_name: %
define
lustre_name lustre}
-%{!?build_lustre_tests: %
define
build_lustre_tests 1}
+%{!?lustre_name: %
global
lustre_name lustre}
+%{!?build_lustre_tests: %
global
build_lustre_tests 1}
# in order to get kernel symset and/or kernel module dependencies into
# the RPM, in order to support weak-modules, the internal dependency gen-
# in order to get kernel symset and/or kernel module dependencies into
# the RPM, in order to support weak-modules, the internal dependency gen-
@@
-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
@@
-252,7
+258,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
@@
-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