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
b=21826 a small fix for quota files invalidation
[fs/lustre-release.git]
/
autoMakefile.am
diff --git
a/autoMakefile.am
b/autoMakefile.am
index
0876803
..
87f7181
100644
(file)
--- a/
autoMakefile.am
+++ b/
autoMakefile.am
@@
-3,19
+3,23
@@
DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS
SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
if LDISKFS_ENABLED
SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
if LDISKFS_ENABLED
+if !LDISKFS_IN_KERNEL
EXTRA_SOURCES := @SYMVERFILE@
endif
EXTRA_SOURCES := @SYMVERFILE@
endif
+endif
include build/autoMakefile.am.toplevel
include build/autoMakefile.am.toplevel
-EXTRA_DIST += config.h.in
+EXTRA_DIST += config.h.in
debian/*
if LDISKFS_ENABLED
if LDISKFS_ENABLED
+if !LDISKFS_IN_KERNEL
@SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
touch @SYMVERFILE@
-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
endif
@SYMVERFILE@: @LDISKFS_DIR@/@SYMVERFILE@
touch @SYMVERFILE@
-grep -v ldiskfs @SYMVERFILE@ > @SYMVERFILE@.old
cat @SYMVERFILE@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
endif
+endif
CSTK=/tmp/checkstack
CSTKO=/tmp/checkstack.orig
CSTK=/tmp/checkstack
CSTKO=/tmp/checkstack.orig
@@
-24,7
+28,7
@@
checkstack:
[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
{ for MOD in $$(find . -name "*.ko"); do \
objdump -d $$MOD | perl build/checkstack.pl; \
[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
{ for MOD in $$(find . -name "*.ko"); do \
objdump -d $$MOD | perl build/checkstack.pl; \
- done } | grep -v " bug " | sort -nr
u
> ${CSTK}
+ done } | grep -v " bug " | sort -nr
| uniq
> ${CSTK}
[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
checkstack-update:
[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
checkstack-update:
@@
-36,4
+40,8
@@
checkstack-clean:
module-dist-hook:
if [ -d CVS -o -d .git ]; then \
perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
module-dist-hook:
if [ -d CVS -o -d .git ]; then \
perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
+ elif [ -f tree_status ]; then \
+ cp tree_status $(distdir)/tree_status; \
+ else \
+ echo -e "I have no idea how to create a tree_status file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
fi
fi