Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • gnome-build-meta gnome-build-meta
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 115
    • Issues 115
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 31
    • Merge requests 31
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GNOME
  • gnome-build-metagnome-build-meta
  • Merge requests
  • !658

WIP: Test junction replacements

  • Review changes

  • Download
  • Email patches
  • Plain diff
Open Valentin David requested to merge valentindavid/junction-replacements into master May 10, 2020
  • Overview 0
  • Commits 1
  • Pipelines 4
  • Changes 15

This commit removes ostree to use it from GNOME SDK to use it from Freedesktop SDK instead. It also injects glib, gobject-introspection and libsoup into Freedesktop SDK graph.

This depends on https://gitlab.com/BuildStream/buildstream/-/merge_requests/1914 (and https://gitlab.com/BuildStream/buildstream/-/merge_requests/1913 in master)

It should also fix #200

The main change is in elements/freedesktop-sdk.bst:

diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 3a060277..ad573ecd 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -6,3 +6,8 @@ sources:
 config:
   options:
     target_arch: '%{arch}'
+  replacements:
+    components/glib.bst: sdk/glib.bst
+    components/gobject-introspection.bst: sdk/gobject-introspection.bst
+    components/pygobject.bst: sdk/pygobject.bst
+    components/libsoup.bst: sdk/libsoup.bst
Edited May 11, 2020 by Valentin David
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: valentindavid/junction-replacements