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
A lack of a SERIES file specified in a target file means that we don't have
[fs/lustre-release.git]
/
build
/
lbuild
diff --git
a/build/lbuild
b/build/lbuild
index
daeaa20
..
8dadf62
100755
(executable)
--- a/
build/lbuild
+++ b/
build/lbuild
@@
-301,8
+301,6
@@
load_target()
. "$TARGET_FILE"
[ "$KERNEL" ] || fatal 1 "Target $TARGET did not specify a kernel."
. "$TARGET_FILE"
[ "$KERNEL" ] || fatal 1 "Target $TARGET did not specify a kernel."
-# [ "$SERIES" ] || fatal 1 "Target $TARGET did not specify a kernel patch series."
-# [ "$CONFIG" ] || fatal 1 "Target $TARGET did not specify a kernel config."
[ "$VERSION" ] || fatal 1 "Target $TARGET did not specify a kernel version."
if [ "$KERNELDIR" ] ; then
[ "$VERSION" ] || fatal 1 "Target $TARGET did not specify a kernel version."
if [ "$KERNELDIR" ] ; then
@@
-699,17
+697,22
@@
unpack_lustre
if [ -z "$LINUX" ] ; then
load_target
if [ -z "$LINUX" ] ; then
load_target
- if (( $DO_SRC )) ; then
- unpack_linux
- patch_linux
- pack_linux
- clean_linux
- fi
+ if [ "$SERIES" ] ; then
+ if (( $DO_SRC )) ; then
+ unpack_linux
+ patch_linux
+ pack_linux
+ clean_linux
+ fi
- prep_kernel_build
- clean_lustre
+
prep_kernel_build
+
clean_lustre
- build_kernel
+ build_kernel
+ else
+ # can't build a kernel if we have no series for it (i.e. patchless)
+ build_lustre
+ fi
else
build_lustre
fi
else
build_lustre
fi