From: brian <brian>
Date: Tue, 4 Apr 2006 21:04:12 +0000 (+0000)
Subject: A lack of a SERIES file specified in a target file means that we don't have
X-Git-Tag: 1.4.10~326
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a6aaba12b428cb7ffb31f0c13dcdd946d21f6ee9;p=fs%2Flustre-release.git

A lack of a SERIES file specified in a target file means that we don't have
patches for a kernel, so why build one.  Specifically this is for building a
patchless client.
This should all work if the concept of:
if [ -z "$LINUX" ] ; then
...
else
    build_lustre
fi
works.  I don't know that we test the build_lustre() function of lbuild with
any regularity, if at all though.
---

diff --git a/build/lbuild b/build/lbuild
index daeaa20..8dadf62 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -301,8 +301,6 @@ load_target()
     . "$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
@@ -699,17 +697,22 @@ unpack_lustre
 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