[gnome-build-meta/abderrahim/bst2: 11/21] project.conf: port to Buildstream 2




commit f5878acf8ca277ff0ad57b4b6cdb6b331a8b32a8
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Feb 14 18:28:35 2020 +0100

    project.conf: port to Buildstream 2

 elements/freedesktop-sdk.bst |  3 +--
 junction.refs                |  6 +++++-
 project.conf                 | 33 ++++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 14 deletions(-)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 7d8702dd8..bf49cde01 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -2,8 +2,7 @@ kind: junction
 sources:
 - kind: git_tag
   url: gitlab:freedesktop-sdk/freedesktop-sdk.git
-  track: master
-  track-tags: true
+  track: abderrahim/bst2
 - kind: patch
   path: files/freedesktop-sdk/0001-polkit-patch-to-print-admin-rule-errors.patch
 config:
diff --git a/junction.refs b/junction.refs
index e77eea9d9..67f2a50af 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,4 +1,8 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: freedesktop-sdk-22.08beta.6-0-g6a488777bf71b12f3cc6bb2066a2d003fde923ab
+    - ref: freedesktop-sdk-22.08rc.1-17-gfae34101f10242474b7acdc40dbe0d1a64ca5b6c
+    plugins/buildstream-plugins.bst:
+    - ref: bce3400e104c7484995014b09366b29b87a4bba480b63f1426091122855941f1
+    plugins/bst-plugins-experimental.bst:
+    - ref: f73f35e6811bb8f6b56cc6e1368ef8a5604bcb59987c7c38771963bb99dbb0e2
diff --git a/project.conf b/project.conf
index c64a443f7..1ef4a55e6 100644
--- a/project.conf
+++ b/project.conf
@@ -1,8 +1,8 @@
 # Project name
 name: gnome
 
-# The minimum base BuildStream format
-format-version: 18
+# The minimum BuildStream version
+min-version: 2.0
 
 # Where elements are stored
 element-path: elements
@@ -166,17 +166,28 @@ variables:
 
 plugins:
 - origin: pip
-  package-name: buildstream-external
+  package-name: buildstream-plugins
   elements:
-    flatpak_image: 0
-    flatpak_repo: 0
-    collect_manifest: 0
-    x86image: 0
+  - autotools
+  - meson
+  - pip
+  - cmake
+  - make
   sources:
-    cargo: 0
-    git_tag: 1
+  - cargo
+  - patch
+
+- origin: pip
+  package-name: bst-plugins-experimental
+  elements:
+  - flatpak_image
+  - flatpak_repo
+  - collect_manifest
+  sources:
+  - git_tag
+
 - origin: local
   path: plugins
   elements:
-    collect_initial_scripts: 0
-    ostree: 0
+  - collect_initial_scripts
+  - ostree


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