summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauren Perry <lauren.perry@codethink.co.uk>2016-05-12 14:27:40 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-05-13 08:35:41 +0000
commit0e0a329c086d424452eaa0bfa77e573f77e3b930 (patch)
treeb7318d9ca8acc3178caa53ffd3b8265942739a9a
parent8f39c37588e7b246bf977058e70ad6d7e4bd93df (diff)
downloaddefinitions-0e0a329c086d424452eaa0bfa77e573f77e3b930.tar.gz
Add erlang dependency to x86 IVI systems, and update erlang to OTP-18.3.3
Change-Id: I89ad3271debed5b697c0c610daef79045c263917
-rw-r--r--strata/erlang.morph4
-rw-r--r--systems/ivi-system-x86_32.morph2
-rw-r--r--systems/ivi-system-x86_64.morph2
3 files changed, 6 insertions, 2 deletions
diff --git a/strata/erlang.morph b/strata/erlang.morph
index 8f92dadb..3aad68e8 100644
--- a/strata/erlang.morph
+++ b/strata/erlang.morph
@@ -7,8 +7,8 @@ chunks:
- name: erlang
morph: strata/erlang/erlang.morph
repo: upstream:erlang
- ref: d646221c59fbf57d5beac913248b46f5dbebfbe7
- unpetrify-ref: OTP-18.2.4
+ ref: 1ab69efa960703b86a13ea6ba96f4fd56f1565f9
+ unpetrify-ref: OTP-18.3.3
- name: rebar
morph: strata/erlang/rebar.morph
repo: upstream:erlang-modules/rebar
diff --git a/systems/ivi-system-x86_32.morph b/systems/ivi-system-x86_32.morph
index a42d9ac4..ae62b2c7 100644
--- a/systems/ivi-system-x86_32.morph
+++ b/systems/ivi-system-x86_32.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/device-management.morph
- name: dlna-services
morph: strata/dlna-services.morph
+- name: erlang
+ morph: strata/erlang.morph
- name: foundation
morph: strata/foundation.morph
- name: geolocation
diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph
index 45ec5cb6..b2e386f3 100644
--- a/systems/ivi-system-x86_64.morph
+++ b/systems/ivi-system-x86_64.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/device-management.morph
- name: dlna-services
morph: strata/dlna-services.morph
+- name: erlang
+ morph: strata/erlang.morph
- name: foundation
morph: strata/foundation.morph
- name: geolocation