summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-26 18:20:23 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-08-27 09:48:54 +0100
commitb940e4736f3559ec310c0d1756604505282cc01e (patch)
tree05b701d6fa64746b498f761c2ecf0e86e91fd883
parentebc704130c4f9263ac15840bef23753d8c08de13 (diff)
downloaddefinitions-b940e4736f3559ec310c0d1756604505282cc01e.tar.gz
weston.morph: Do not disable weston-launch
-rw-r--r--strata/weston-genivi.morph7
-rw-r--r--strata/weston-genivi/weston.morph2
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 e12a5fc1..459444b9 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -10,7 +10,7 @@ configure-commands:
--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