From 0eedc523dd8281ea482cf4ba94422aa4706aadf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:16 +0100 Subject: weston.morph: Do not disable weston-launch --- strata/weston-genivi.morph | 7 ++++++- strata/weston-genivi/weston.morph | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 569f69b5..735f8076 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -7,12 +7,17 @@ build-depends: - morph: strata/x-common.morph - morph: strata/wayland-generic.morph chunks: +- name: linux-pam + repo: upstream:linux-pam + ref: master + build-depends: [] - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston ref: 8658e06e69cc3944e89684a2de619e479751633f unpetrify-ref: baserock/genivi/baseline-h-1.1 - build-depends: [] + build-depends: + - linux-pam - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph index 8ce58496..5def796e 100644 --- a/strata/weston-genivi/weston.morph +++ b/strata/weston-genivi/weston.morph @@ -8,7 +8,7 @@ configure-commands: LDFLAGS='-L/lib64 -lrt' \ ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \ --disable-drm-compositor --disable-x11-compositor \ - --disable-wayland-compositor --disable-weston-launch --enable-egl \ + --disable-wayland-compositor --enable-egl \ --enable-clients --enable-demo-clients-install --enable-fbdev-compositor post-install-commands: - install -d "$DESTDIR/usr/share/weston" -- cgit v1.2.1