diff options
author | Javier Jardón <jjardon@gnome.org> | 2015-02-10 17:32:22 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2015-02-10 17:32:55 +0000 |
commit | 1f18880def044dfb62a813b3da8dd782b21c3d77 (patch) | |
tree | 4e364118eb27f247032ffa4731489328743a6282 /strata | |
parent | 5a5e418103a1784bdbeb82e2048a0712db0e9139 (diff) | |
parent | 8532b1c5ce9cf91e28ea931aa7a62368762296bb (diff) | |
download | definitions-1f18880def044dfb62a813b3da8dd782b21c3d77.tar.gz |
Merge branch 'baserock/jjardon/linux_pam'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk>
Diffstat (limited to 'strata')
-rw-r--r-- | strata/foundation.morph | 6 | ||||
-rw-r--r-- | strata/weston-common.morph | 8 | ||||
-rw-r--r-- | strata/weston-genivi.morph | 8 |
3 files changed, 8 insertions, 14 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph index 2445c004..e3bebe05 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -73,6 +73,11 @@ chunks: ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 build-depends: - libgpg-error +- name: linux-pam + repo: upstream:linux-pam + ref: b1521c97e73b10469f7b34c0571d51c647eca83c + unpetrify-ref: Linux-PAM-1.1.8 + build-depends: [] - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd @@ -84,6 +89,7 @@ chunks: - kmod - libcap2 - libgcrypt + - linux-pam - name: libusb repo: upstream:libusb ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9 diff --git a/strata/weston-common.morph b/strata/weston-common.morph index b690966d..f79510c8 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -7,15 +7,9 @@ build-depends: - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: -- name: linux-pam - repo: upstream:linux-pam - ref: b1521c97e73b10469f7b34c0571d51c647eca83c - unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston ref: 06315ce5b9569e02ec4e7d322d933bc247620aff unpetrify-ref: baserock/weston-1.6.93/tegra - build-depends: - - linux-pam + build-depends: [] diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index d47d0ac4..ce403b6b 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -7,18 +7,12 @@ build-depends: - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: -- name: linux-pam - repo: upstream:linux-pam - ref: b1521c97e73b10469f7b34c0571d51c647eca83c - unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 unpetrify-ref: baserock/genivi/1.3.0 - build-depends: - - linux-pam + build-depends: [] - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension |