From fb467b9b7e7c92b6cfcf8b4c3aba0f87915f309a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 21 Sep 2014 03:07:43 +0000 Subject: Split libdrm from graphics-infra stratum and create libdrm-common stratum So libdrm only gets build when it's really needed --- strata/graphics-infra.morph | 14 -------------- strata/graphics-infra/drm.morph | 10 ---------- strata/libdrm-common.morph | 17 +++++++++++++++++ strata/libdrm-common/drm.morph | 10 ++++++++++ strata/mesa-common.morph | 2 +- strata/weston-genivi.morph | 2 +- strata/x-generic.morph | 1 + systems/genivi-baseline-system-armv7lhf-versatile.morph | 4 ++-- systems/genivi-baseline-system-x86_64-generic.morph | 4 ++-- 9 files changed, 34 insertions(+), 30 deletions(-) delete mode 100644 strata/graphics-infra/drm.morph create mode 100644 strata/libdrm-common.morph create mode 100644 strata/libdrm-common/drm.morph diff --git a/strata/graphics-infra.morph b/strata/graphics-infra.morph index e4d00659..c120a76f 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/graphics-infra/drm.morph b/strata/graphics-infra/drm.morph deleted file mode 100644 index 8f5b88e2..00000000 --- a/strata/graphics-infra/drm.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: drm -kind: chunk -build-system: autotools -configure-commands: - - NOCONFIGURE=1 ./autogen.sh - - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api -install-commands: - - make install DESTDIR="$DESTDIR" - - mkdir -p "$DESTDIR"/usr/lib/pkgconfig - - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph new file mode 100644 index 00000000..cea69e38 --- /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/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph new file mode 100644 index 00000000..8f5b88e2 --- /dev/null +++ b/strata/libdrm-common/drm.morph @@ -0,0 +1,10 @@ +name: drm +kind: chunk +build-system: autotools +configure-commands: + - NOCONFIGURE=1 ./autogen.sh + - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api +install-commands: + - make install DESTDIR="$DESTDIR" + - mkdir -p "$DESTDIR"/usr/lib/pkgconfig + - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 6c8e4eb9..9be31a80 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 89170e3a..dd4d5b9b 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 1c5a9dab..5ccf5196 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 11f46a2c..d32bd2ba 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 -- cgit v1.2.1