summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2014-06-13 16:16:55 +0000
committerJames Thomas <james.thomas@codethink.co.uk>2014-06-13 16:18:17 +0000
commit39da41ff31bac5a2d4a745165e0e9eb38c50c8ac (patch)
tree99aa7adbe54dae5e72bf8cd3d31cf32b712a2f22
parent09e6acdff0035b216d81668cbdd7be4ec4c313d1 (diff)
parentebb3668cd3fd471574ef68ae3ff5d3bcbd22eb0f (diff)
downloaddefinitions-39da41ff31bac5a2d4a745165e0e9eb38c50c8ac.tar.gz
Merge Jetson morphologies
Conflicts: core.morph scripts/distbuild-cluster.py tools.morph
-rw-r--r--devel-system-armv7lhf-jetson.morph16
-rw-r--r--genivi-baseline-system-armv7lhf-jetson.morph24
-rw-r--r--virtualization.morph4
-rw-r--r--wayland-armv7-nvidia-tegra.morph129
-rw-r--r--wayland-armv7-versatile.morph4
-rw-r--r--wayland-x86_64-generic.morph4
-rw-r--r--x-common.morph21
7 files changed, 183 insertions, 19 deletions
diff --git a/devel-system-armv7lhf-jetson.morph b/devel-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..07a66d3e
--- /dev/null
+++ b/devel-system-armv7lhf-jetson.morph
@@ -0,0 +1,16 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+description: A system that is able to build other systems based on the NVIDIA Jetson TK1.
+kind: system
+name: devel-system-armv7lhf-jetson
+strata:
+- morph: build-essential
+- morph: core
+- morph: foundation
+- morph: tools
+- morph: openstack-clients
diff --git a/genivi-baseline-system-armv7lhf-jetson.morph b/genivi-baseline-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..7d12bd79
--- /dev/null
+++ b/genivi-baseline-system-armv7lhf-jetson.morph
@@ -0,0 +1,24 @@
+arch: armv7lhf
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+- fstab
+description: A GENIVI baseline system for an NVIDIA Jetson board.
+kind: system
+name: genivi-baseline-system-armv7lhf-jetson
+strata:
+- morph: build-essential
+- morph: core
+- morph: foundation
+- morph: genivi-foundation
+- morph: bsp-armv7-versatile
+- morph: connectivity
+- morph: audio-bluetooth
+- morph: x-common
+- morph: multimedia
+- morph: genivi
+- morph: wayland-armv7-nvidia-tegra
diff --git a/virtualization.morph b/virtualization.morph
index 33e662b4..f805cb7b 100644
--- a/virtualization.morph
+++ b/virtualization.morph
@@ -32,8 +32,8 @@ chunks:
build-depends: []
- name: xorg-util-macros
repo: upstream:xorg-util-macros
- ref: c98b41de5596c675c603ef43ae9570133f1a9921
- unpetrify-ref: baserock/morph
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: c98b41de5596c675c603ef43ae9570133f1a9921
build-depends: []
- name: libpciaccess
repo: upstream:libpciaccess
diff --git a/wayland-armv7-nvidia-tegra.morph b/wayland-armv7-nvidia-tegra.morph
new file mode 100644
index 00000000..b9dfcaec
--- /dev/null
+++ b/wayland-armv7-nvidia-tegra.morph
@@ -0,0 +1,129 @@
+name: wayland-armv7-nvidia-tegra
+kind: stratum
+build-depends:
+- morph: x-common
+chunks:
+- name: libxkbcommon
+ repo: upstream:xorg-lib-libxkbcommon
+ ref: b721254769212d671a4729f1c88b059979b80efc
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends: []
+- name: wayland
+ repo: upstream:wayland
+ ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c
+ unpetrify-ref: baserock/1.4.0
+ build-depends:
+ - libxkbcommon
+- name: mesa-wayland
+ repo: upstream:mesa
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: e51e5d4f9875e9a970d7560c6ac0bfed933facc5
+ build-depends:
+ - wayland
+- name: pixman
+ repo: upstream:pixman
+ ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: freetype2
+ repo: upstream:freetype2
+ ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: fontconfig
+ repo: upstream:fontconfig
+ ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - freetype2
+- name: freefont-otf
+ repo: upstream:freefont-otf
+ ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: cairo
+ repo: upstream:cairo
+ ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
+ unpetrify-ref: baserock/genivi/1.12.10
+ build-depends:
+ - fontconfig
+ - freetype2
+ - wayland
+ - mesa-wayland
+ - pixman
+- name: mtdev
+ repo: upstream:mtdev-git
+ ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends: []
+- name: xorg-lib-libxkbfile
+ repo: upstream:xorg-lib-libxkbfile
+ ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xorg-app-xkbcomp
+ repo: upstream:xorg-app-xkbcomp
+ ref: 705b9bbb426410f9510601c7010da51184919b36
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libxkbfile
+- name: xkeyboard-config
+ repo: upstream:xkeyboard-config
+ ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-app-xkbcomp
+- name: libevdev
+ repo: upstream:libevdev
+ ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends: []
+- name: linux-api-headers
+ repo: upstream:linux
+ ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: libinput
+ repo: upstream:libinput
+ ref: f0fd32db8f3df558e1d763dfa2db76cdca260323
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - libxkbcommon
+ - mtdev
+ - libevdev
+ - linux-api-headers
+- name: harfbuzz
+ repo: upstream:harfbuzz
+ ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
+ unpetrify-ref: baserock/0.9.12
+ build-depends:
+ - freetype2
+- name: pango
+ repo: upstream:pango
+ ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
+ unpetrify-ref: baserock/1.36.3
+ build-depends:
+ - cairo
+ - harfbuzz
+ - fontconfig
+ - freetype2
+ - freefont-otf
+- name: weston
+ repo: upstream:weston
+ ref: 721c0f13ab80eb209983c1d73e168df4ffb70ddc
+ unpetrify-ref: baserock/genivi/weston-ivi-shell-patches
+ build-depends:
+ - pango
+ - pixman
+ - libxkbcommon
+ - wayland
+ - mesa-wayland
+ - libinput
+ - cairo
+- name: wayland-ivi-extension
+ repo: upstream:genivi/wayland-ivi-extension
+ ref: 167029fad4d2896491093ee313a663f2f057217e
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - wayland
+ - weston
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index 1bc2019c..e1134012 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -16,8 +16,8 @@ chunks:
- libxkbcommon
- name: mesa-wayland
repo: upstream:mesa
- ref: e51e5d4f9875e9a970d7560c6ac0bfed933facc5
- unpetrify-ref: baserock/arm/10.0.4-gallium
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: e51e5d4f9875e9a970d7560c6ac0bfed933facc5
build-depends:
- wayland
- name: pixman
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 6441a1f3..d5e95c84 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -16,8 +16,8 @@ chunks:
- libxkbcommon
- name: mesa-wayland
repo: upstream:mesa
- ref: a77b370b4ba1045e2612650503cf45827af94a12
- unpetrify-ref: baserock/10.0.4-gallium
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: a77b370b4ba1045e2612650503cf45827af94a12
build-depends:
- wayland
- name: pixman
diff --git a/x-common.morph b/x-common.morph
index 77ba793b..d20a0874 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -3,11 +3,6 @@ kind: stratum
build-depends:
- morph: genivi-foundation
chunks:
-- name: llvm
- repo: upstream:llvm
- ref: 60aa15443579a9542a1e8818f3c5dd901edb03d9
- unpetrify-ref: baserock/morph
- build-depends: []
- name: libpng
repo: upstream:libpng
ref: 981560ae6094f0b0557e82c33d7ae5f7d81ca0ea
@@ -20,8 +15,8 @@ chunks:
build-depends: []
- name: xorg-util-macros
repo: upstream:xorg-util-macros
- ref: c98b41de5596c675c603ef43ae9570133f1a9921
- unpetrify-ref: baserock/morph
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: c98b41de5596c675c603ef43ae9570133f1a9921
build-depends: []
- name: xorg-proto-bigreqsproto
repo: upstream:xorg-proto-bigreqsproto
@@ -175,8 +170,8 @@ chunks:
- xorg-util-macros
- name: xcb-proto
repo: upstream:xcb-proto
- ref: ca30e6d5d7a0c7618d988f9051026d250f5e124e
- unpetrify-ref: baserock/morph
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: ca30e6d5d7a0c7618d988f9051026d250f5e124e
build-depends:
- xorg-util-macros
- name: xorg-lib-libXau
@@ -188,8 +183,8 @@ chunks:
- xorg-util-macros
- name: xcb-libxcb
repo: upstream:xcb-libxcb
- ref: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13
- unpetrify-ref: baserock/morph
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13
build-depends:
- xcb-proto
- xcb-pthread-stubs
@@ -225,8 +220,8 @@ chunks:
- xorg-util-macros
- name: drm
repo: upstream:drm
- ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de
- unpetrify-ref: baserock/libdrm-2.4.49
+ ref: hawkdevtrove/sam/jetson
+ unpetrify-ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de
build-depends:
- xcb-pthread-stubs
- xorg-lib-libpciaccess