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-9850 patchless client should conflict patched kernel
[fs/lustre-release.git]
/
contrib
/
lbuild
/
lbuild
diff --git
a/contrib/lbuild/lbuild
b/contrib/lbuild/lbuild
index
99dd601
..
bf9e754
100755
(executable)
--- a/
contrib/lbuild/lbuild
+++ b/
contrib/lbuild/lbuild
@@
-934,8
+934,8
@@
build_lustre() {
./configure $configure_args $CONFIGURE_FLAGS 2>&1 ||
fatal 1 "Error in configure."
- if type -p apply_kmod_requires; then
- apply_kmod_requires
+ if type -p apply_kmod_requires
_conflicts
; then
+ apply_kmod_requires
_conflicts
fi
make rpms 2>&1 ||