summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-09-21 03:07:43 (GMT)
committerJames Thomas <james.thomas@codethink.co.uk>2014-10-10 19:18:30 (GMT)
commitfb467b9b7e7c92b6cfcf8b4c3aba0f87915f309a (patch)
tree2ddf2776a5091499eb4592fa29a8eed93eb5ecde
parent44a860fd0628968a546d59dda4f8dc64c37fd7c2 (diff)
downloaddefinitions-fb467b9b7e7c92b6cfcf8b4c3aba0f87915f309a.tar.gz
Split libdrm from graphics-infra stratum and create libdrm-common stratum
So libdrm only gets build when it's really needed
-rw-r--r--strata/graphics-infra.morph14
-rw-r--r--strata/libdrm-common.morph17
-rw-r--r--strata/libdrm-common/drm.morph (renamed from strata/graphics-infra/drm.morph)0
-rw-r--r--strata/mesa-common.morph2
-rw-r--r--strata/weston-genivi.morph2
-rw-r--r--strata/x-generic.morph1
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph4
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph4
8 files changed, 24 insertions, 20 deletions
diff --git a/strata/graphics-infra.morph b/strata/graphics-infra.morph
index e4d0065..c120a76 100644
--- a/strata/graphics-infra.morph
+++ b/strata/graphics-infra.morph
@@ -14,17 +14,3 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- xorg-util-macros
-- name: xorg-lib-libpciaccess
- repo: upstream:xorg-lib-libpciaccess
- ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-util-macros
-- name: drm
- repo: upstream:drm
- morph: strata/graphics-infra/drm.morph
- ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b
- unpetrify-ref: baserock/jetson/drm
- build-depends:
- - xcb-pthread-stubs
- - xorg-lib-libpciaccess
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
new file mode 100644
index 0000000..cea69e3
--- /dev/null
+++ b/strata/libdrm-common.morph
@@ -0,0 +1,17 @@
+name: libdrm-common
+kind: stratum
+build-depends:
+- morph: strata/graphics-infra.morph
+chunks:
+- name: xorg-lib-libpciaccess
+ repo: upstream:xorg-lib-libpciaccess
+ ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: drm
+ repo: upstream:drm
+ morph: strata/libdrm-common/drm.morph
+ ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b
+ unpetrify-ref: baserock/jetson/drm
+ build-depends:
+ - xorg-lib-libpciaccess
diff --git a/strata/graphics-infra/drm.morph b/strata/libdrm-common/drm.morph
index 8f5b88e..8f5b88e 100644
--- a/strata/graphics-infra/drm.morph
+++ b/strata/libdrm-common/drm.morph
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 6c8e4eb..9be31a8 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -3,7 +3,7 @@ kind: stratum
build-depends:
- morph: strata/llvm-common.morph
- morph: strata/x-common.morph
-- morph: strata/graphics-infra.morph
+- morph: strata/libdrm-common.morph
- morph: strata/wayland-generic.morph
chunks:
- name: mesa
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 89170e3..dd4d5b9 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -4,7 +4,7 @@ build-depends:
- morph: strata/graphics-common.morph
- morph: strata/input-common.morph
- morph: strata/mesa-common.morph
-- morph: strata/graphics-infra.morph
+- morph: strata/libdrm-common.morph
- morph: strata/wayland-generic.morph
chunks:
- name: linux-pam
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index b30b2a9..69e0540 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -2,6 +2,7 @@ name: x-generic
kind: stratum
build-depends:
- morph: strata/foundation.morph
+- morph: strata/libdrm-common.morph
- morph: strata/mesa-common.morph
- morph: strata/x-common.morph
- morph: strata/graphics-common.morph
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 1c5a9da..5ccf519 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: x-common
morph: strata/x-common.morph
-- name: graphics-infra
- morph: strata/graphics-infra.morph
+- name: libdrm-common
+ morph: strata/libdrm-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: genivi
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 11f46a2..d32bd2b 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: x-common
morph: strata/x-common.morph
-- name: graphics-infra
- morph: strata/graphics-infra.morph
+- name: libdrm-common
+ morph: strata/libdrm-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: genivi