diff options
author | Javier Jardón <jjardon@gnome.org> | 2014-09-21 03:07:43 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2014-09-25 19:52:10 +0100 |
commit | 8622115ffb2bec6200520b29bb1fbadb4af784bb (patch) | |
tree | 6e65bd4615dd9b16aaeb1aa0775453d2ef7c4250 | |
parent | 56c709187d371dd82b33d6a03b027a97152a4ed2 (diff) | |
download | definitions-8622115ffb2bec6200520b29bb1fbadb4af784bb.tar.gz |
Split libdrm from graphics-infra stratum and create libdrm-common stratum
So libdrm only gets build when it really needed
-rw-r--r-- | strata/graphics-infra.morph | 13 | ||||
-rw-r--r-- | strata/libdrm-common.morph | 16 | ||||
-rw-r--r-- | strata/mesa-common.morph | 2 | ||||
-rw-r--r-- | strata/weston-genivi.morph | 2 | ||||
-rw-r--r-- | strata/x-generic.morph | 1 | ||||
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-versatile.morph | 4 | ||||
-rw-r--r-- | systems/genivi-baseline-system-x86_64-generic.morph | 4 |
7 files changed, 23 insertions, 19 deletions
diff --git a/strata/graphics-infra.morph b/strata/graphics-infra.morph index 8d723bce..c120a76f 100644 --- a/strata/graphics-infra.morph +++ b/strata/graphics-infra.morph @@ -14,16 +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 - ref: d6861609b2b887612d652bb2be7c39f199802937 - unpetrify-ref: libdrm-2.4.56 - 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 00000000..ff4dd96f --- /dev/null +++ b/strata/libdrm-common.morph @@ -0,0 +1,16 @@ +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 + ref: d6861609b2b887612d652bb2be7c39f199802937 + unpetrify-ref: libdrm-2.4.56 + build-depends: + - xorg-lib-libpciaccess diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 13a64367..0c0863dd 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -2,7 +2,7 @@ name: mesa-common kind: stratum build-depends: - morph: strata/x-common.morph -- morph: strata/graphics-infra.morph +- morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: - name: llvm diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 1cf4087b..437e9682 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 b30b2a9a..69e05400 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 350895a7..ae22ea8f 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -17,8 +17,8 @@ strata: morph: strata/connectivity.morph - name: audio-bluetooth morph: strata/audio-bluetooth.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 fac0f557..51710bf4 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -17,8 +17,8 @@ strata: morph: strata/connectivity.morph - name: audio-bluetooth morph: strata/audio-bluetooth.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 |