diff options
author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-10-05 07:16:31 +0000 |
---|---|---|
committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-10-05 11:08:36 +0000 |
commit | a18d755ef9eb0b321ce904657c8269fff3d16cf6 (patch) | |
tree | d50a8f75143efb01f88ce2d67df19d86ed69b3c9 | |
parent | cb9966aa9206d2e4ffc6ace54da8502a91f3b0c2 (diff) | |
download | definitions-baserock/ps/jt-gdp.tar.gz |
Tweaks to make build on x86 - needs tidyupbaserock/ps/jt-gdp
-rw-r--r-- | clusters/upgrade-devel.morph | 3 | ||||
-rwxr-xr-x | scripts/cycle.sh | 43 | ||||
-rw-r--r-- | strata/genivi-demo-platform.morph | 4 | ||||
-rw-r--r-- | strata/genivi-smartdevicelink/smartdevicelink-qt.morph | 11 | ||||
-rw-r--r-- | strata/mesa-common/mesa.morph | 2 | ||||
-rw-r--r-- | systems/genivi-plusplus-system-x86.morph | 52 |
6 files changed, 101 insertions, 14 deletions
diff --git a/clusters/upgrade-devel.morph b/clusters/upgrade-devel.morph index 3937521e..4e26157c 100644 --- a/clusters/upgrade-devel.morph +++ b/clusters/upgrade-devel.morph @@ -32,8 +32,9 @@ description: | On a base system, use 'diff -r' instead of 'git diff --no-index'. It will not be as colourful. systems: -- morph: systems/devel-system-x86_64-generic.morph +- morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: self: type: ssh-rsync location: root@localhost + KERNEL_ARGS: vga=788 diff --git a/scripts/cycle.sh b/scripts/cycle.sh new file mode 100755 index 00000000..8fab43b7 --- /dev/null +++ b/scripts/cycle.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +usage() { + echo "Usage: cycle.sh some-system some-cluster" + echo + echo "This builds and deploys the current checked out version of" + echo "some-system, applying it as a self-upgrade to the system you" + echo "are working in, using configuration from some-cluster." + echo "The upgrade is labelled TEST, and is set to be the default for" + echo "next boot." +} + +if [ -z "$1" ] || [ -z "$2" ] ; then + usage + exit 1 +fi + +set -e +set -v + +morph gc +morph build $1 +system-version-manager set-default factory +if [ `system-version-manager list | grep ^TEST$` ]; then + system-version-manager remove TEST +fi + +sed -i "s|^- morph: .*$|- morph: $1|" $2 +morph deploy --upgrade $2 self.HOSTNAME=$(hostname) self.VERSION_LABEL=TEST diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index d0530622..1ef0932e 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -36,8 +36,8 @@ chunks: - name: dbus-c++ morph: strata/genivi-demo-platform/dbus-c++.morph repo: upstream:dbus-c++ - ref: master - unpetrify-ref: master + ref: 8d351eec25430651acbac014e44ec011fac32d57 + unpetrify-ref: baserock/genivi-demo-platform build-depends: [] - name: libxslt repo: upstream:libxslt diff --git a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph index 91e1f1fe..f7967a9c 100644 --- a/strata/genivi-smartdevicelink/smartdevicelink-qt.morph +++ b/strata/genivi-smartdevicelink/smartdevicelink-qt.morph @@ -1,18 +1,9 @@ name: smartdevicelink-qt kind: chunk - +max-jobs: 1 configure-commands: - cmake -D HMI2=ON -DCMAKE_INSTALL_PREFIX="$PREFIX/smartdevicelink-qt" -DEXTENDED_MEDIA_MODE=ON --debug-output . build-commands: - make install-commands: - make install DESTDIR=$DESTDIR - - mkdir -p $DESTDIR/opt/smartlink/include - - mkdir -p $DESTDIR/opt/smartlink/bin - - mkdir -p $DESTDIR/opt/smartlink/lib - - mkdir -p $DESTDIR/opt/smartlink/HMI - - cp -r SDL_Core/bin/* $DESTDIR/opt/smartlink/bin - - cp -r SDL_Core/include/* $DESTDIR/opt/smartlink/include - - cp -r SDL_Core/lib/* $DESTDIR/opt/smartlink/lib - - cp -r SDL_Core/src/components/HMI/* $DESTDIR/opt/smartlink/HMI - - echo "/opt/smartlink/HMI/index.html" > $DESTDIR/opt/smartlink/bin/hmi_link diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 58e74f99..d31693f6 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -4,7 +4,7 @@ build-system: autotools configure-commands: - | cpu=$(echo $TARGET | cut -d '-' -f 1) - EXTRAARGS=--disable-gallium-egl + EXTRAARGS=--enable-gallium-egl case "$cpu" in x86_32|x64_64) DRIDRIVERS=intel,i915,i965,swrast diff --git a/systems/genivi-plusplus-system-x86.morph b/systems/genivi-plusplus-system-x86.morph new file mode 100644 index 00000000..02f870b9 --- /dev/null +++ b/systems/genivi-plusplus-system-x86.morph @@ -0,0 +1,52 @@ +name: genivi-plusplus-system-x86 +kind: system +description: A GENIVI baseline system for a Jetson TK with GStreamer and QT added +arch: x86_64 +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-x86_64-generic + morph: strata/bsp-x86_64-generic.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 + morph: strata/multimedia.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: mesa-common + morph: strata/mesa-common.morph +- name: weston-genivi + morph: strata/weston-genivi.morph +- name: qt5-tools-jetson + morph: strata/qt5-tools-jetson.morph +- name: genivi-smartdevicelink + morph: strata/genivi-smartdevicelink.morph +- name: tools + morph: strata/tools.morph +- name: genivi-demo-platform + morph: strata/genivi-demo-platform.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- fstab |