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




commit e15a160d82ff65e125e228c38c2cfcaac986357c
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 |  5 +----
 junction.refs                |  2 +-
 project.conf                 | 26 +++++++++++++++-----------
 3 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 0a56a7f8..45c55e4a 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -2,10 +2,7 @@ kind: junction
 sources:
 - kind: git_tag
   url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
-  track: release/20.08
-  track-tags: true
-- kind: patch
-  path: files/freedesktop-sdk/0001-components-linux.bst-compile-features-needes-for-liv.patch
+  track: abderrahim/bst2
 config:
   options:
     target_arch: '%{arch}'
diff --git a/junction.refs b/junction.refs
index 4b7fa913..4e2364dd 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,6 +1,6 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: freedesktop-sdk-20.08.5-0-gdd20bd4dc3c919ee968395ce4b1303d8cd14201f
+    - ref: freedesktop-sdk-20.08.6-32-gbc81cc6360f4777493d3bdcc3fa382bd5f0f358a
     openh264-extension.bst:
     - ref: openh264-2.0.0-4-0-g7191bc88fbeed3ac842543706f856cb6dde99bc9
diff --git a/project.conf b/project.conf
index 4bf36122..ccf6035e 100644
--- a/project.conf
+++ b/project.conf
@@ -1,8 +1,8 @@
 # Project name
 name: gnome
 
-# The minimum base BuildStream format
-format-version: 14
+# The minimum BuildStream version
+min-version: 2.0
 
 # Where elements are stored
 element-path: elements
@@ -321,17 +321,21 @@ variables:
 
 plugins:
 - origin: pip
-  package-name: buildstream-external
+  package-name: bst-plugins-experimental
   elements:
-    flatpak_image: 0
-    flatpak_repo: 0
-    collect_manifest: 0
-    x86image: 0
+  - cmake
+  - distutils
+  - make
+  - meson
+  - flatpak_image
+  - flatpak_repo
+  - collect_manifest
+  - x86image
   sources:
-    cargo: 0
-    git_tag: 1
+  - cargo
+  - 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]