summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-06 12:31:12 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-06 12:31:12 (GMT)
commit6f6ae875a9026949d8c143c54b2dd39fe7280cb3 (patch)
treeb3323c51c69c4cde4cbc71ccda7a11c06abd7e8e
parentc85678db412a710a4ee339cebd3664028eee8429 (diff)
parent7b6512340fa31b02a497e32a6c9b8b8c52aa49fe (diff)
downloaddefinitions-6f6ae875a9026949d8c143c54b2dd39fe7280cb3.tar.gz
Merge branch 'baserock/pedroalvarez/genivi-jupiter2'
Reviewed-By: Javier Jardón <javier.jardon@codethink.co.uk> Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
-rw-r--r--strata/genivi.morph40
-rw-r--r--strata/genivi/DLT-daemon.morph5
-rw-r--r--strata/genivi/libarchive.morph6
-rw-r--r--strata/genivi/persistence-administrator.morph5
-rw-r--r--strata/genivi/persistence-client-library.morph6
-rw-r--r--strata/genivi/persistence-common-object.morph5
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph2
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph2
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
9 files changed, 71 insertions, 2 deletions
diff --git a/strata/genivi.morph b/strata/genivi.morph
index c8fe153..ef8d670 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -3,6 +3,7 @@ kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
- morph: strata/foundation.morph
+- morph: strata/audio-bluetooth.morph
chunks:
- name: linuxquota
morph: strata/genivi/linuxquota.morph
@@ -11,6 +12,7 @@ chunks:
unpetrify-ref: baserock/genivi/morph
build-depends: []
- name: DLT-daemon
+ morph: strata/genivi/DLT-daemon.morph
repo: upstream:DLT-daemon
ref: 8b48e73f79b4463393916e4c6696917e3dedd026
unpetrify-ref: v2.10.0
@@ -64,11 +66,21 @@ chunks:
ref: 4ebcf671416927b64475da7b810b6016c847bf73
unpetrify-ref: baserock/genivi/baseline
build-depends: []
+- name: persistence-common-object
+ morph: strata/genivi/persistence-common-object.morph
+ repo: upstream:genivi/persistence-common-object
+ ref: dc46126214022d068729f7ccd47415dc5f86f425
+ unpetrify-ref: baserock/pedroalvarez/1.0.2
+ build-depends:
+ - itzam-tarball
+ - DLT-daemon
- name: persistence-client-library
+ morph: strata/genivi/persistence-client-library.morph
repo: upstream:genivi/persistence-client-library
- ref: 0934ba263e69be8453cc3150f997dad28489f0c7
- unpetrify-ref: baserock/genivi/baseline
+ ref: 39c68df2a9ee0b089212855f64a61fbd671b1a80
+ unpetrify-ref: baserock/pedroalvarez/v1.0.0
build-depends:
+ - persistence-common-object
- DLT-daemon
- itzam-tarball
- name: node-state-manager
@@ -78,3 +90,27 @@ chunks:
build-depends:
- DLT-daemon
- persistence-client-library
+- name: libarchive
+ morph: strata/genivi/libarchive.morph
+ repo: git://github.com/libarchive/libarchive.git
+ ref: 19f23e191f9d3e1dd2a518735046100419965804
+ unpetrify-ref: v3.1.2
+ build-depends: []
+- name: persistence-administrator
+ morph: strata/genivi/persistence-administrator.morph
+ repo: upstream:genivi/persistence-administrator
+ ref: f9d62e70237c05323cbd60f1d5c7b574fbc2de43
+ unpetrify-ref: baserock/pedroalvarez/1.0.5
+ build-depends:
+ - persistence-common-object
+ - DLT-daemon
+ - libarchive
+ - node-state-manager
+- name: node-health-monitor
+ repo: upstream:genivi/node-health-monitor
+ ref: 2af264563ef1b60ba2636cbf5e8cd6a7ed07b0c0
+ unpetrify-ref: baserock/pedroalvarez/1.3.3
+ build-depends:
+ - node-state-manager
+ - persistence-client-library
+ - DLT-daemon
diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph
new file mode 100644
index 0000000..e22e31e
--- /dev/null
+++ b/strata/genivi/DLT-daemon.morph
@@ -0,0 +1,5 @@
+name: DLT-deamon
+kind: chunk
+build-system: cmake
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DWITH_SYSTEMD=ON
diff --git a/strata/genivi/libarchive.morph b/strata/genivi/libarchive.morph
new file mode 100644
index 0000000..bf840f5
--- /dev/null
+++ b/strata/genivi/libarchive.morph
@@ -0,0 +1,6 @@
+name: libarchive
+kind: chunk
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX" --disable-acl
diff --git a/strata/genivi/persistence-administrator.morph b/strata/genivi/persistence-administrator.morph
new file mode 100644
index 0000000..f4fd07a
--- /dev/null
+++ b/strata/genivi/persistence-administrator.morph
@@ -0,0 +1,5 @@
+name: persistence-administrator
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- chmod +x autogen.sh
diff --git a/strata/genivi/persistence-client-library.morph b/strata/genivi/persistence-client-library.morph
new file mode 100644
index 0000000..6ea6aef
--- /dev/null
+++ b/strata/genivi/persistence-client-library.morph
@@ -0,0 +1,6 @@
+name: persistence-client-library
+kind: chunk
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX" --disable-werror
diff --git a/strata/genivi/persistence-common-object.morph b/strata/genivi/persistence-common-object.morph
new file mode 100644
index 0000000..179a603
--- /dev/null
+++ b/strata/genivi/persistence-common-object.morph
@@ -0,0 +1,5 @@
+name: persistence-common-object
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- chmod +x autogen.sh
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 5058156..512248e 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -33,6 +33,8 @@ strata:
morph: strata/input-common.morph
- name: mesa-common
morph: strata/mesa-common.morph
+- name: x-common
+ morph: strata/x-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions:
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 16bed19..ee08953 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -31,6 +31,8 @@ strata:
morph: strata/graphics-common.morph
- name: input-common
morph: strata/input-common.morph
+- name: x-common
+ morph: strata/x-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions:
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index f482868..d50068e 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -35,6 +35,8 @@ strata:
morph: strata/llvm-common.morph
- name: mesa-common
morph: strata/mesa-common.morph
+- name: x-common
+ morph: strata/x-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions: