[gnome-build-meta/abderrahim/bst2: 23/24] Use plugins from junction origin




commit ab504ae69dc57a72e2c2a84dd78e82575388e29a
Author: Abderrahim Kitouni <abderrahim kitouni codethink co uk>
Date:   Thu Jul 7 08:06:45 2022 +0100

    Use plugins from junction origin

 elements/freedesktop-sdk.bst                  |  3 +++
 elements/plugins/bst-plugins-experimental.bst |  5 +++++
 elements/plugins/buildstream-plugins.bst      |  5 +++++
 junction.refs                                 |  4 ++++
 project.conf                                  | 21 ++++++++++++++-------
 5 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index e22363a5a..fb6552ec2 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -17,3 +17,6 @@ config:
         bootstrap_build_arch: "ppc64le"
     - arch == "riscv64":
         bootstrap_build_arch: "x86_64"
+  overrides:
+    plugins/bst-plugins-experimental.bst: plugins/bst-plugins-experimental.bst
+    plugins/buildstream-plugins.bst: plugins/buildstream-plugins.bst
diff --git a/elements/plugins/bst-plugins-experimental.bst b/elements/plugins/bst-plugins-experimental.bst
new file mode 100644
index 000000000..8a53f551b
--- /dev/null
+++ b/elements/plugins/bst-plugins-experimental.bst
@@ -0,0 +1,5 @@
+kind: junction
+
+sources:
+- kind: tar
+  url: 
gitlab:BuildStream/bst-plugins-experimental/-/archive/fca5db54dc294c3369ef72ba252633eaa60b7da8/bst-plugins-experimental-fca5db54dc294c3369ef72ba252633eaa60b7da8.tar.bz2
diff --git a/elements/plugins/buildstream-plugins.bst b/elements/plugins/buildstream-plugins.bst
new file mode 100644
index 000000000..769c3c259
--- /dev/null
+++ b/elements/plugins/buildstream-plugins.bst
@@ -0,0 +1,5 @@
+kind: junction
+
+sources:
+- kind: tar
+  url: github_files:apache/buildstream-plugins/archive/cca8c316d5b63b1c01ecd8645d0a0b63274e8b98.tar.gz
diff --git a/junction.refs b/junction.refs
index 2975023a0..82686ab71 100644
--- a/junction.refs
+++ b/junction.refs
@@ -2,3 +2,7 @@ projects:
   gnome:
     freedesktop-sdk.bst:
     - ref: freedesktop-sdk-22.08beta.1-77-g010e91cdd9ecfd10b74d83af27566f1e5f1dc4f4
+    plugins/buildstream-plugins.bst:
+    - ref: 41499239ec48df55bc720635f70c0a7631e506c48dbfb5ab6e24d539fa533001
+    plugins/bst-plugins-experimental.bst:
+    - ref: f73f35e6811bb8f6b56cc6e1368ef8a5604bcb59987c7c38771963bb99dbb0e2
diff --git a/project.conf b/project.conf
index 69db6a161..770731c69 100644
--- a/project.conf
+++ b/project.conf
@@ -159,21 +159,28 @@ variables:
   fix-pyc-timestamps: ''
 
 plugins:
-- origin: pip
-  package-name: bst-plugins-experimental
+- origin: junction
+  junction: plugins/buildstream-plugins.bst
   elements:
+  - autotools
+  - meson
+  - pip
   - cmake
-  - distutils
   - make
-  - meson
+  sources:
+  - cargo
+  - patch
+
+- origin: junction
+  junction: plugins/bst-plugins-experimental.bst
+  elements:
+  - distutils
   - flatpak_image
   - flatpak_repo
   - collect_manifest
-  - pip
-  - x86image
   sources:
-  - cargo
   - git_tag
+
 - origin: local
   path: plugins
   elements:


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