[gnome-ostree] Support "bootstrap" annotation on modules



commit c709bc187375006bb18b6f4377a9111dde8b8b69
Author: Colin Walters <walters verbum org>
Date:   Tue Jul 17 21:56:16 2012 -0400

    Support "bootstrap" annotation on modules
    
    When given, this annotation says that while it will appear in
    buildroots, the module should not appear in the final trees.
    
    Used for the vala-tarballs-as-git module which we just use to
    bootstrap vala.

 gnomeos-3.6.json                         |    1 +
 src/ostbuild/pyostbuild/builtin_build.py |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/gnomeos-3.6.json b/gnomeos-3.6.json
index 3aafe42..94c8f3e 100644
--- a/gnomeos-3.6.json
+++ b/gnomeos-3.6.json
@@ -665,6 +665,7 @@
 		{"src": "gnome:gjs"},
 
 		{"src": "cgwalters:vala-tarballs-as-git",
+		 "bootstrap": true,
 		 "config-opts": ["--disable-build-from-vala",
 		                 "--disable-vapigen"],
 		 "rm-configure": true,
diff --git a/src/ostbuild/pyostbuild/builtin_build.py b/src/ostbuild/pyostbuild/builtin_build.py
index ca3a87e..211eacd 100755
--- a/src/ostbuild/pyostbuild/builtin_build.py
+++ b/src/ostbuild/pyostbuild/builtin_build.py
@@ -381,6 +381,9 @@ class OstbuildBuild(builtins.Builtin):
                     
                 contents = []
                 for component in target_components:
+                    if component.get('bootstrap'):
+                        log("Skipping bootstrap component %r" % (component['name'], ))
+                        continue
                     builds_for_component = component_to_arches[component['name']]
                     if architecture not in builds_for_component:
                         continue



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]