ts-kernel-build: adjust for armhf

Requires per-arch defconfig and kernel image settings.

Add a kernel build phase to make-flight.

diff --git a/make-flight b/make-flight
index f180ac21bbeefc89b7d24e22915746f6ae2b158b..7cc3f7b06212509e18774fbdfc755fd163d2cc04 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -64,10 +64,6 @@ if [ x$buildflight = x ]; then
                revision_qemu=$REVISION_QEMU                                 \
                revision_qemuu=$REVISION_QEMU_UPSTREAM
 
-    case "$arch" in
-    armhf) continue;; # don't do any kernel builds
-    esac
-
     ./cs-job-create $flight build-$arch-pvops build-kern                    \
                arch=$arch kconfighow=xen-enable-xen-config                  \
        tree_xen=$TREE_XEN                   \
@@ -81,6 +77,10 @@ if [ x$buildflight = x ]; then
                tree_linuxfirmware=$TREE_LINUXFIRMWARE                       \
                revision_linuxfirmware=$REVISION_LINUXFIRMWARE
 
+    case "$arch" in
+    armhf) continue;; # don't do any other kernel builds
+    esac
+
     if [ "x$REVISION_LINUX_OLD" != xdisable ]; then
 
       ./cs-job-create $flight build-$arch-oldkern build                        \

diff --git a/ts-kernel-build b/ts-kernel-build
index bdae4330df8f8da32a4ced075897a4ff80de03b9..21328e7e44f5a22910902988c765f499dd65fd86 100755 (executable)
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -31,6 +31,12 @@ my $builddir= "/home/osstest/$leaf";
 
 my $makeflags= get_host_property($ho, 'build make flags', '-j4');
 
+my $archparms = {
+    'armhf' => { DefConfig => 'multi_v7_defconfig', KernelImage => 'arch/arm/boot/zImage' },
+    'i386'  => { DefConfig => 'defconfig',          KernelImage => 'arch/x86/boot/bzImage' },
+    'amd64' => { DefConfig => 'defconfig',          KernelImage => 'arch/x86/boot/bzImage' }
+};
+
 sub checkout () {
     target_cmd($ho, "rm -rf $builddir && mkdir $builddir", 600);
 
@@ -208,7 +214,9 @@ END
         ed <$edscript enable-xen-config
         chmod +x enable-xen-config
         cd linux
-        make defconfig
+        make $archparms->{ $r{arch} }->{DefConfig}
+        # ARM defconfig omits modules for some reason...
+        sed -e "s/^# CONFIG_MODULES is not set\$/CONFIG_MODULES=y/g" -i .config
         ../enable-xen-config .config
         yes '' | make oldconfig
 END
@@ -246,7 +254,7 @@ END
 
 sub kinstall () {
     my $kernfile= $r{kimagefile};
-    $kernfile= 'arch/x86/boot/bzImage' if !defined $kernfile;
+    $kernfile= $archparms->{$r{arch}}->{KernelImage} if !defined $kernfile;
 
     target_cmd_build($ho, 300, $builddir, <<END);
        mkdir -p dist/boot dist/lib/modules