Jenkins: build the kernel last
authorBarret Rhoden <brho@cs.berkeley.edu>
Tue, 6 May 2014 01:34:27 +0000 (18:34 -0700)
committerBarret Rhoden <brho@cs.berkeley.edu>
Tue, 6 May 2014 01:34:27 +0000 (18:34 -0700)
We need to build busybox before the kernel, due to KFS issues with
symlinks.  As a short-term fix, building busybox before the kernel
should work.  Longer term, we should fix up the busybox build steps, and
drop it under tools/ or something.

tools/jenkins/launcher.sh

index befad7f..c1b59f4 100755 (executable)
@@ -257,9 +257,9 @@ if [ "$COMPILE_ALL" == true ]; then
        build_config
        
        build_cross_compiler
-       build_kernel
        build_userspace
        build_busybox
+       build_kernel
 
        run_qemu
 
@@ -280,15 +280,10 @@ else
                if [[ $AFFECTED_COMPONENTS == *cross-compiler* ]]
                then
                        build_cross_compiler
-                       build_kernel
                        build_userspace
                        build_busybox
+                       build_kernel
                else 
-                       if [[ $AFFECTED_COMPONENTS == *kernel* ]]
-                       then
-                               build_kernel
-                       fi
-
                        if [[ $AFFECTED_COMPONENTS == *userspace* ]]
                        then
                                build_userspace
@@ -298,6 +293,11 @@ else
                        then
                                build_busybox
                        fi
+
+                       if [[ $AFFECTED_COMPONENTS == *kernel* ]]
+                       then
+                               build_kernel
+                       fi
                fi
        else
                echo "Skipping build. No changes detected."