Skip to content
Snippets Groups Projects
Commit 5f56885a authored by gord-fig's avatar gord-fig
Browse files

Distribute obdfs, put modules in /lib/modules//kernel/fs/lustre.

parent baccd629
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,8 @@ AUTOMAKE_OPTIONS = foreign ...@@ -7,7 +7,8 @@ AUTOMAKE_OPTIONS = foreign
# NOTE: keep extN before mds # NOTE: keep extN before mds
SUBDIRS = lov utils obdclass ldlm ptlrpc llite lib obdecho mdc osc extN SUBDIRS = lov utils obdclass ldlm ptlrpc llite lib obdecho mdc osc extN
SUBDIRS+= mds ost tests obdfilter demos doc scripts #obdfs SUBDIRS+= mds ost tests obdfilter demos doc scripts
DIST_SUBDIRS = $(SUBDIRS) obdfs
EXTRA_DIST = BUGS FDL Rules include patches archdep.m4 EXTRA_DIST = BUGS FDL Rules include patches archdep.m4
# We get the version from the spec file. # We get the version from the spec file.
......
...@@ -73,7 +73,7 @@ changequote([, ]) ...@@ -73,7 +73,7 @@ changequote([, ])
moduledir='$(libdir)/modules/'$RELEASE/kernel moduledir='$(libdir)/modules/'$RELEASE/kernel
AC_SUBST(moduledir) AC_SUBST(moduledir)
modulefsdir='$(moduledir)/fs' modulefsdir='$(moduledir)/fs/$(PACKAGE)'
AC_SUBST(modulefsdir) AC_SUBST(modulefsdir)
AC_MSG_RESULT($RELEASE) AC_MSG_RESULT($RELEASE)
......
#! /bin/sh #! /bin/sh
# Common stub for a few missing GNU programs while installing. # Common stub for a few missing GNU programs while installing.
# Copyright (C) 1996, 1997 Free Software Foundation, Inc. # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -18,11 +18,37 @@ ...@@ -18,11 +18,37 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA. # 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information" echo 1>&2 "Try \`$0 --help' for more information"
exit 1 exit 1
fi fi
run=:
# In the cases where this matters, `missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
else
configure_ac=configure.in
fi
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
;;
esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case "$1" in case "$1" in
-h|--h|--he|--hel|--help) -h|--h|--he|--hel|--help)
...@@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM. ...@@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM.
Options: Options:
-h, --help display this help and exit -h, --help display this help and exit
-v, --version output version information and exit -v, --version output version information and exit
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values: Supported PROGRAM values:
aclocal touch file \`aclocal.m4' aclocal touch file \`aclocal.m4'
...@@ -43,13 +70,15 @@ Supported PROGRAM values: ...@@ -43,13 +70,15 @@ Supported PROGRAM values:
automake touch all \`Makefile.in' files automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch] bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c flex create \`lex.yy.c', if possible, from existing .c
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]" yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;; ;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version) -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing - GNU libit 0.0" echo "missing 0.4 - GNU automake"
;; ;;
-*) -*)
...@@ -58,31 +87,46 @@ Supported PROGRAM values: ...@@ -58,31 +87,46 @@ Supported PROGRAM values:
exit 1 exit 1
;; ;;
aclocal) aclocal*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acinclude.m4' or \`configure.in'. You might want you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site." any GNU archive site."
touch aclocal.m4 touch aclocal.m4
;; ;;
autoconf) autoconf)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if WARNING: \`$1' is missing on your system. You should only need it if
you modified \`configure.in'. You might want to install the you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site." archive site."
touch configure touch configure
;; ;;
autoheader) autoheader)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if WARNING: \`$1' is missing on your system. You should only need it if
you modified \`acconfig.h' or \`configure.in'. You might want you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site." from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h" test -z "$files" && files="config.h"
touch_files= touch_files=
for f in $files; do for f in $files; do
...@@ -95,10 +139,15 @@ WARNING: \`$1' is missing on your system. You should only need it if ...@@ -95,10 +139,15 @@ WARNING: \`$1' is missing on your system. You should only need it if
touch $touch_files touch $touch_files
;; ;;
automake) automake*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if WARNING: \`$1' is missing on your system. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages. You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site." Grab them from any GNU archive site."
find . -type f -name Makefile.am -print | find . -type f -name Makefile.am -print |
...@@ -106,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if ...@@ -106,6 +155,34 @@ WARNING: \`$1' is missing on your system. You should only need it if
while read f; do touch "$f"; done while read f; do touch "$f"; done
;; ;;
autom4te)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them.
You can get \`$1Help2man' as part of \`Autoconf' from any GNU
archive site."
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo "#! /bin/sh"
echo "# Created by GNU Automake missing as a replacement of"
echo "# $ $@"
echo "exit 0"
chmod +x $file
exit 1
fi
;;
bison|yacc) bison|yacc)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if WARNING: \`$1' is missing on your system. You should only need it if
...@@ -159,7 +236,37 @@ WARNING: \`$1' is missing on your system. You should only need it if ...@@ -159,7 +236,37 @@ WARNING: \`$1' is missing on your system. You should only need it if
fi fi
;; ;;
help2man)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
fi
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
fi
if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
exit 1
fi
;;
makeinfo) makeinfo)
if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
# We have makeinfo, but it failed.
exit 1
fi
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file you modified a \`.texi' or \`.texinfo' file, or any other file
...@@ -175,6 +282,45 @@ WARNING: \`$1' is missing on your system. You should only need it if ...@@ -175,6 +282,45 @@ WARNING: \`$1' is missing on your system. You should only need it if
touch $file touch $file
;; ;;
tar)
shift
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
# messages.
if (gnutar --version > /dev/null 2>&1); then
gnutar "$@" && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
gtar "$@" && exit 0
fi
firstarg="$1"
if shift; then
case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
;;
esac
fi
echo 1>&2 "\
WARNING: I can't seem to be able to run \`tar' with the given arguments.
You may want to install GNU tar or Free paxutils, or check the
command line arguments."
exit 1
;;
*) *)
echo 1>&2 "\ echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your WARNING: \`$1' is needed, and you do not seem to have it handy on your
......
...@@ -84,19 +84,20 @@ find . -print | cpio -ap $RPM_BUILD_ROOT/usr/src/lustre-%{version} ...@@ -84,19 +84,20 @@ find . -print | cpio -ap $RPM_BUILD_ROOT/usr/src/lustre-%{version}
%files -n lustre-modules %files -n lustre-modules
%attr(-, root, root) %doc COPYING %attr(-, root, root) %doc COPYING
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/extN.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/extN.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ldlm.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ldlm.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/llite.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/llite.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mdc.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mdc.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mds.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mds.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/mds_extN.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/mds_extN.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdclass.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdclass.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdecho.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdecho.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdfilter.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdfilter.o
#%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/obdfs.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/lov.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/osc.o #%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/obdfs.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ost.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/osc.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/ptlrpc.o %attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ost.o
%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/ptlrpc.o
%files -n lustre-source %files -n lustre-source
%attr(-, root, root) /usr/src/lustre-%{version} %attr(-, root, root) /usr/src/lustre-%{version}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment