[gnome-continuous/wip/hwtest: 5/11] Add a "minimal" tree

[Owen Taylor <otaylor src gnome org>]

commit 9433d184ee5009f3bb34cb8c165ae5d5b5713709
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Thu Jun 5 09:54:16 2014 -0400

    Add a "minimal" tree
    
    The minimal tree contains enough to boot to a command line environment.

 src/js/tasks/task-build.js      |   30 +++++++++++++++++++++++-------
 src/js/tasks/task-builddisks.js |    2 +-
 2 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/src/js/tasks/task-build.js b/src/js/tasks/task-build.js
index 7499b12..4437c28 100644
--- a/src/js/tasks/task-build.js
+++ b/src/js/tasks/task-build.js
@@ -1292,6 +1292,7 @@ const TaskBuild = new Lang.Class({
         let componentToArches = {};
 
         let runtimeComponents = [];
+        let minimalComponents = [];
         let develComponents = [];
         let testingComponents = [];
 
@@ -1299,15 +1300,23 @@ const TaskBuild = new Lang.Class({
            let component = components[i];
             let name = component['name']
 
-            let isRuntime = (component['component'] || 'runtime') == 'runtime';
-            let isTesting = (component['component'] || 'runtime') == 'testing';
+            let resolved = component['component'] || 'runtime';
+            let isMinimalOnly = resolved == 'minimal-only';
+            let isMinimal = resolved == 'minimal-only' || resolved == 'minimal';
+            let isRuntime = resolved == 'minimal' || resolved == 'runtime';
+            let isTesting = resolved == 'testing';
 
             if (isRuntime) {
                 runtimeComponents.push(component);
            } else if (isTesting) {
                testingComponents.push(component);
            }
-           develComponents.push(component);
+            if (isMinimal) {
+                minimalComponents.push(component);
+            }
+            if (!isMinimalOnly) {
+               develComponents.push(component);
+            }
 
            let isNoarch = component['noarch'] || false;
            let componentArches;
@@ -1368,7 +1377,7 @@ const TaskBuild = new Lang.Class({
        }
 
         let targetsList = [];
-       let componentTypes = ['runtime', 'devel-debug'];
+       let componentTypes = ['runtime', 'minimal', 'devel-debug'];
         for (let i = 0; i < componentTypes.length; i++) {
            let targetComponentType = componentTypes[i];
             for (let i = 0; i < architectures.length; i++) {
@@ -1380,7 +1389,7 @@ const TaskBuild = new Lang.Class({
                 let baseRuntimeRef = baseName + '/' + architecture + '-runtime';
                 let buildrootRef = baseName + '/' + architecture + '-devel';
                let baseRef;
-                if (targetComponentType == 'runtime') {
+                if (targetComponentType == 'runtime' || targetComponentType == 'minimal') {
                     baseRef = baseRuntimeRef;
                 } else {
                     baseRef = buildrootRef;
@@ -1392,10 +1401,13 @@ const TaskBuild = new Lang.Class({
                let targetComponents;
                 if (targetComponentType == 'runtime') {
                     targetComponents = runtimeComponents;
+                } else if (targetComponentType == 'minimal') {
+                    targetComponents = minimalComponents;
                 } else {
+                    targetComponents = runtimeComponents;
                     targetComponents = develComponents;
                }
-                    
+
                 let contents = [];
                 for (let i = 0; i < targetComponents.length; i++) {
                    let component = targetComponents[i];
@@ -1408,7 +1420,7 @@ const TaskBuild = new Lang.Class({
                    }
                     let binaryName = component['name'] + '/' + architecture;
                     let componentRef = {'name': binaryName};
-                    if (targetComponentType == 'runtime') {
+                    if (targetComponentType == 'runtime' || targetComponentType == 'minimal') {
                         componentRef['trees'] = ['/runtime'];
                    } else if (targetComponentType == 'devel-debug') {
                         componentRef['trees'] = ['/runtime', '/devel', '/tests', '/doc', '/debug'];
@@ -1480,6 +1492,10 @@ const TaskBuild = new Lang.Class({
                }));
                let kernelInitramfsData = archInitramfsImages[architecture];
                this._installKernelAndInitramfs(kernelInitramfsData, composeRootdir, cancellable);
+
+                if (target == 'minimal')
+                    this._setHWTestTarget(composeRootdir, cancellable);
+
                this._cleanupGarbage(composeRootdir, cancellable);
                let [treename, ostreeRev] = this._commitComposedTree(runtimeTargetName, composeRootdir, 
cancellable);
                BuildUtil.timeSubtask("cleanup " + runtimeTargetName, Lang.bind(this, function() {
diff --git a/src/js/tasks/task-builddisks.js b/src/js/tasks/task-builddisks.js
index ad7d408..931542b 100644
--- a/src/js/tasks/task-builddisks.js
+++ b/src/js/tasks/task-builddisks.js
@@ -46,7 +46,7 @@ const TaskBuildDisks = new Lang.Class({
 
     _imageSubdir: 'images',
     _inheritPreviousDisk: true,
-    _onlyTreeSuffixes: ['-runtime', '-devel-debug'],
+    _onlyTreeSuffixes: ['-runtime', '-minimal', '-devel-debug'],
 
     DefaultParameters: {targets: null},