summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-28 00:22:16 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-28 10:46:22 (GMT)
commit0eedc523dd8281ea482cf4ba94422aa4706aadf0 (patch)
tree525163085e68db2bb2532388b2cd3da48bf99ae9
parentae380fa19f904931f173089ee0e98a33a0e8b41f (diff)
downloaddefinitions-0eedc523dd8281ea482cf4ba94422aa4706aadf0.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 569f69b..735f807 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 8ce5849..5def796 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"