[gnome-build-meta/abderrahim/os-release: 4/7] Use python3-{user, site}customize only for Flatpak




commit 922ee3007622043e1a466affb9a4c706da41d28f
Author: Valentin David <valentin david codethink co uk>
Date:   Mon Aug 17 10:14:09 2020 +0200

    Use python3-{user,site}customize only for Flatpak

 elements/flatpak/platform-image.bst | 22 ++++++++--------------
 elements/flatpak/sdk-image.bst      | 30 ++++++++++--------------------
 elements/sdk-platform.bst           |  2 --
 3 files changed, 18 insertions(+), 36 deletions(-)
---
diff --git a/elements/flatpak/platform-image.bst b/elements/flatpak/platform-image.bst
index 9e74f75d..971eaa32 100644
--- a/elements/flatpak/platform-image.bst
+++ b/elements/flatpak/platform-image.bst
@@ -1,18 +1,12 @@
 kind: compose
-depends:
-- filename: platform-manifest.bst
-  type: build
-- filename: sdk-platform.bst
-  type: build
-- filename: multiarch/multiarch-platform.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: integration/split-locales.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: integration/split-docs.bst
-  junction: freedesktop-sdk.bst
-  type: build
+build-depends:
+- platform-manifest.bst
+- sdk-platform.bst
+- freedesktop-sdk.bst:components/python3-usercustomize.bst
+- freedesktop-sdk.bst:components/python3-sitecustomize.bst
+- freedesktop-sdk.bst:multiarch/multiarch-platform.bst
+- freedesktop-sdk.bst:integration/split-locales.bst
+- freedesktop-sdk.bst:integration/split-docs.bst
 config:
   exclude:
   - devel
diff --git a/elements/flatpak/sdk-image.bst b/elements/flatpak/sdk-image.bst
index 776b52a3..732d0d1f 100644
--- a/elements/flatpak/sdk-image.bst
+++ b/elements/flatpak/sdk-image.bst
@@ -1,24 +1,14 @@
 kind: compose
-depends:
-- filename: sdk.bst
-  type: build
-- filename: sdk-manifest.bst
-  type: build
-- filename: multiarch/multiarch-sdk.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: integration/split-locales.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: integration/split-docs.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: integration/flatpak-builder-configuration.bst
-  junction: freedesktop-sdk.bst
-  type: build
-- filename: integration/debug-app-link.bst
-  junction: freedesktop-sdk.bst
-  type: build
+build-depends:
+- sdk.bst
+- sdk-manifest.bst
+- freedesktop-sdk.bst:components/python3-usercustomize.bst
+- freedesktop-sdk.bst:components/python3-sitecustomize.bst
+- freedesktop-sdk.bst:multiarch/multiarch-sdk.bst
+- freedesktop-sdk.bst:integration/split-locales.bst
+- freedesktop-sdk.bst:integration/split-docs.bst
+- freedesktop-sdk.bst:integration/flatpak-builder-configuration.bst
+- freedesktop-sdk.bst:integration/debug-app-link.bst
 config:
   exclude:
   - extra
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index d6c9791f..fcd40a76 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -134,8 +134,6 @@ depends:
 - freedesktop-sdk.bst:components/python3.bst
 - freedesktop-sdk.bst:components/python3-setuptools.bst
 - freedesktop-sdk.bst:components/python3-six.bst
-- freedesktop-sdk.bst:components/python3-usercustomize.bst
-- freedesktop-sdk.bst:components/python3-sitecustomize.bst
 - freedesktop-sdk.bst:components/tar.bst
 - freedesktop-sdk.bst:components/sndfile.bst
 - freedesktop-sdk.bst:components/sqlite.bst


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