summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-15 14:06:56 +0000
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-09-15 14:06:56 +0000
commit2fabcf542369db5c3d77c0dfd194c2fe0e0cd4ea (patch)
tree6878f517a11c05a6a50887c9fe108cfc83870751
parentcf770f5d4f6473fe127eb53d98daa3aca51d530b (diff)
downloaddefinitions-2fabcf542369db5c3d77c0dfd194c2fe0e0cd4ea.tar.gz
Bring systems up-to-scratch closer to what James and Sam had before
-rw-r--r--strata/mesa-common.morph4
-rw-r--r--strata/mesa-common/mesa.morph19
-rw-r--r--strata/multimedia-gstreamer-0.10.morph4
-rw-r--r--strata/qt5-tools-jetson.morph137
-rw-r--r--strata/weston-genivi.morph5
-rw-r--r--strata/weston-genivi/wayland-ivi-extension.morph9
-rw-r--r--strata/weston-genivi/weston.morph9
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph2
-rw-r--r--systems/genivi-plusplus-system-armv7lhf-jetson.morph43
9 files changed, 221 insertions, 11 deletions
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index b5a3ec6c..37d3c2c3 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -5,6 +5,8 @@ build-depends:
- morph: strata/wayland-generic.morph
chunks:
- name: mesa
+ morph: strata/mesa-common/mesa.morph
repo: upstream:mesa
- ref: baserock/unified
+ ref: ct-mcr-1/danielsilverstone/jetson-genivi
+ unpetrify-ref: baserock/unified
build-depends: []
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 733e1b1f..58e74f99 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -4,19 +4,30 @@ build-system: autotools
configure-commands:
- |
cpu=$(echo $TARGET | cut -d '-' -f 1)
+ EXTRAARGS=--disable-gallium-egl
case "$cpu" in
x86_32|x64_64)
DRIDRIVERS=intel,i915,i965,swrast
+ GALLIUMDRIVERS=swrast
+ EGLPLATFORMS=x11,wayland,drm
+ ;;
+ armv7lhf)
+ DRIDRIVERS=nouveau,swrast
+ GALLIUMDRIVERS=nouveau,swrast
+ EXTRAARGS="--with-state-trackers=egl --enable-gallium-egl"
+ EGLPLATFORMS=wayland,drm
;;
*)
DRIDRIVERS=swrast
+ GALLIUMDRIVERS=swrast
+ EGLPLATFORMS=x11,wayland,drm
;;
esac
./autogen.sh --prefix="$PREFIX" \
--enable-gles2 \
- --disable-gallium-egl \
- --with-egl-platforms=x11,drm,wayland \
+ --with-egl-platforms="$EGLPLATFORMS" \
--enable-gbm \
--enable-shared-glapi \
- --with-gallium-drivers=swrast \
- --with-dri-drivers="$DRIDRIVERS"
+ --with-gallium-drivers="$GALLIUMDRIVERS" \
+ --with-dri-drivers="$DRIDRIVERS" \
+ --disable-dri3 $EXTRAARGS
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index ae5fe656..5b0cc28c 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -13,8 +13,8 @@ chunks:
build-depends: []
- name: gstreamer
repo: upstream:gstreamer
- ref: c7e4a97d26396882960fd399b1a5e298e40d2a35
- unpetrify-ref: baserock/morph/0.10
+ ref: 60185a634b9322758faf0578687594133cd9e6fa
+ unpetrify-ref: baserock/james/0.10
build-depends:
- orc
- name: gstreamer-plugins-base
diff --git a/strata/qt5-tools-jetson.morph b/strata/qt5-tools-jetson.morph
new file mode 100644
index 00000000..a717219c
--- /dev/null
+++ b/strata/qt5-tools-jetson.morph
@@ -0,0 +1,137 @@
+name: qt5-tools-jetson
+kind: stratum
+description: Qt5 Development Libraries and Tools for nvidia Jetson tk1
+build-depends:
+- morph: strata/tools.morph
+- morph: strata/wayland-generic.morph
+- morph: strata/multimedia-gstreamer-0.10.morph
+- morph: strata/mesa-common.morph
+chunks:
+- name: icu
+ repo: upstream:icu
+ ref: ba023548a3bff7277cbea4acade3042ce9d8949e
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: ruby-1.8
+ repo: upstream:ruby
+ ref: 7a24f1710028d568ad61d0aa49d5178260178d77
+ unpetrify-ref: baserock/morph/ruby_1_8_7
+ build-depends: []
+- name: ruby-1.9
+ repo: upstream:ruby
+ ref: cb3ea602294b5038b5f7ac21d3875a2b52342956
+ unpetrify-ref: baserock/morph/ruby_1_9_3
+ build-depends:
+ - ruby-1.8
+- name: qtbase
+ repo: upstream:qt5/qtbase
+ ref: baserock/v5.3.0
+ build-depends:
+ - icu
+- name: qtsvg
+ repo: upstream:qt5/qtsvg
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qtscript
+ repo: upstream:qt5/qtscript
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qtdeclarative
+ repo: upstream:qt5/qtdeclarative
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qtscript
+- name: qtmultimedia
+ repo: upstream:qt5/qtmultimedia
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qtdeclarative
+- name: qtquick1
+ repo: upstream:qt5/qtquick1
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qtscript
+- name: qt3d
+ repo: upstream:qt5/qt3d
+ ref: bdb98baf8253c69949a8c259369203da9ffb269c
+ build-depends:
+ - qtbase
+ - qtscript
+ - qtdeclarative
+- name: qtquickcontrols
+ repo: upstream:qt5/qtquickcontrols
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qtdeclarative
+- name: qtsensors
+ repo: upstream:qt5/qtsensors
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qtserialport
+ repo: upstream:qt5/qtserialport
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qtwebkit
+ repo: upstream:qt5/qtwebkit
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - icu
+ - ruby-1.9
+ - qtdeclarative
+- name: qtxmlpatterns
+ repo: upstream:qt5/qtxmlpatterns
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qtwebkit-examples
+ repo: upstream:qt5/qtwebkit-examples
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qtdeclarative
+ - qtwebkit
+ - qtxmlpatterns
+- name: qtdoc
+ repo: upstream:qt5/qtdoc
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qtgraphicaleffects
+ repo: upstream:qt5/qtgraphicaleffects
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qtdeclarative
+- name: qtimageformats
+ repo: upstream:qt5/qtimageformats
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qttools
+ repo: upstream:qt5/qttools
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qtdeclarative
+ - qtwebkit
+- name: qtwayland
+ repo: upstream:qt5/qtwayland
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+- name: qttranslations
+ repo: upstream:qt5/qttranslations
+ ref: baserock/v5.3.0
+ build-depends:
+ - qtbase
+ - qttools
+
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 9299d3ee..13543998 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -19,8 +19,9 @@ chunks:
build-depends:
- linux-pam
- name: wayland-ivi-extension
+ morph: strata/weston-genivi/wayland-ivi-extension.morph
repo: upstream:genivi/wayland-ivi-extension
- ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
- unpetrify-ref: baserock/genivi/baseline-h-1.1
+ ref: ct-mcr-1/danielsilverstone/jetson-genivi
+ unpetrify-ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
build-depends:
- weston
diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph
new file mode 100644
index 00000000..14d5d1f8
--- /dev/null
+++ b/strata/weston-genivi/wayland-ivi-extension.morph
@@ -0,0 +1,9 @@
+name: wayland-ivi-extension
+kind: chunk
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX
+build-commands:
+- make
+install-commands:
+- make install DESTDIR=$DESTDIR
+
diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
index 892adfb4..e4d8a260 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -5,11 +5,16 @@ build-system: autotools
configure-commands:
- autoreconf -ivf
- |
+ if test "$MORPH_ARCH" = "armv7lhf"; then
+ TEGRA=--enable-libdrm-tegra
+ else
+ TEGRA=
+ fi
LDFLAGS='-L/lib64 -lrt' \
./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
- --disable-x11-compositor \
+ --disable-x11-compositor $TEGRA \
--disable-wayland-compositor --enable-egl \
- --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
+ --enable-clients --enable-demo-clients-install --enable-fbdev-compositor
post-install-commands:
- install -d "$DESTDIR/usr/share/weston"
- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/"
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 0e8e52e8..9ed7a19a 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -29,6 +29,8 @@ strata:
morph: strata/graphics-common.morph
- name: input-common
morph: strata/input-common.morph
+- name: mesa-common
+ morph: strata/mesa-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions:
diff --git a/systems/genivi-plusplus-system-armv7lhf-jetson.morph b/systems/genivi-plusplus-system-armv7lhf-jetson.morph
new file mode 100644
index 00000000..3314f96b
--- /dev/null
+++ b/systems/genivi-plusplus-system-armv7lhf-jetson.morph
@@ -0,0 +1,43 @@
+name: genivi-plusplus-system-armv7lhf-jetson
+kind: system
+description: A GENIVI baseline system for a Jetson TK with GStreamer and QT added
+arch: armv7lhf
+strata:
+- name: build-essential
+ morph: strata/build-essential.morph
+- name: core
+ morph: strata/core.morph
+- name: foundation
+ morph: strata/foundation.morph
+- name: genivi-foundation
+ morph: strata/genivi-foundation.morph
+- name: bsp-jetson-devel
+ morph: strata/bsp-jetson-devel.morph
+- name: connectivity
+ morph: strata/connectivity.morph
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth.morph
+- name: x-common
+ morph: strata/x-common.morph
+- name: multimedia-gstreamer-0.10
+ morph: strata/multimedia-gstreamer-0.10.morph
+- name: genivi
+ morph: strata/genivi.morph
+- name: wayland-generic
+ morph: strata/wayland-generic.morph
+- name: graphics-common
+ morph: strata/graphics-common.morph
+- name: input-common
+ morph: strata/input-common.morph
+- name: weston-genivi
+ morph: strata/weston-genivi.morph
+- name: qt5-tools-jetson
+ morph: strata/qt5-tools-jetson.morph
+configuration-extensions:
+- set-hostname
+- add-config-files
+- simple-network
+- nfsboot
+- install-files
+- strip-gplv3
+- fstab