From c38a7cdf83af58277ddbbff7ec87be0d08ba8c8a Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 10 Aug 2016 09:58:03 +0000 Subject: Move GENIVI definitions to 'genivi' subfolder This folder will now contain all the definitions related to GENIVI systems. Change-Id: Ia4dda4dc90b780807647861ae6f9c406262f85c0 --- strata/genivi-demo-platform-libs.morph | 18 --- strata/genivi-demo-platform-libs/dbus-c++.morph | 9 -- strata/genivi-demo-platform.morph | 42 ------- strata/genivi-demo-platform/audiomanager-poc.morph | 10 -- strata/genivi-demo-platform/audiomanager@gdp.morph | 14 --- strata/genivi-demo-platform/browser-poc.morph | 29 ----- .../genivi-demo-platform-hmi.morph | 137 --------------------- strata/genivi-demo-platform/mm-common.morph | 7 -- strata/genivi.morph | 107 ---------------- strata/genivi/DLT-daemon.morph | 7 -- strata/genivi/genivi-common-api-dbus-runtime.morph | 3 - strata/genivi/genivi-common-api-runtime.morph | 3 - strata/genivi/googlemock.morph | 8 -- strata/genivi/googletest.morph | 7 -- strata/genivi/itzam-tarball.morph | 10 -- strata/genivi/linuxquota.morph | 10 -- strata/genivi/node-startup-controller.morph | 9 -- strata/genivi/persistence-administrator.morph | 5 - strata/genivi/persistence-common-object.morph | 5 - strata/weston-genivi.morph | 21 ---- strata/weston-genivi/wayland-ivi-extension.morph | 8 -- strata/weston-genivi/weston.morph | 86 ------------- 22 files changed, 555 deletions(-) delete mode 100644 strata/genivi-demo-platform-libs.morph delete mode 100644 strata/genivi-demo-platform-libs/dbus-c++.morph delete mode 100644 strata/genivi-demo-platform.morph delete mode 100644 strata/genivi-demo-platform/audiomanager-poc.morph delete mode 100644 strata/genivi-demo-platform/audiomanager@gdp.morph delete mode 100644 strata/genivi-demo-platform/browser-poc.morph delete mode 100644 strata/genivi-demo-platform/genivi-demo-platform-hmi.morph delete mode 100644 strata/genivi-demo-platform/mm-common.morph delete mode 100644 strata/genivi.morph delete mode 100644 strata/genivi/DLT-daemon.morph delete mode 100644 strata/genivi/genivi-common-api-dbus-runtime.morph delete mode 100644 strata/genivi/genivi-common-api-runtime.morph delete mode 100644 strata/genivi/googlemock.morph delete mode 100644 strata/genivi/googletest.morph delete mode 100644 strata/genivi/itzam-tarball.morph delete mode 100644 strata/genivi/linuxquota.morph delete mode 100644 strata/genivi/node-startup-controller.morph delete mode 100644 strata/genivi/persistence-administrator.morph delete mode 100644 strata/genivi/persistence-common-object.morph delete mode 100644 strata/weston-genivi.morph delete mode 100644 strata/weston-genivi/wayland-ivi-extension.morph delete mode 100644 strata/weston-genivi/weston.morph (limited to 'strata') diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph deleted file mode 100644 index 06987f61..00000000 --- a/strata/genivi-demo-platform-libs.morph +++ /dev/null @@ -1,18 +0,0 @@ -name: genivi-demo-platform-libs -kind: stratum -description: Libraries needed for the GENIVI demo platform. -build-depends: -- morph: strata/foundation.morph -- morph: strata/python-pygobject.morph -- morph: strata/bluetooth.morph -chunks: -- name: dbus-c++ - morph: strata/genivi-demo-platform-libs/dbus-c++.morph - repo: upstream:dbus-c++ - ref: 8d351eec25430651acbac014e44ec011fac32d57 - unpetrify-ref: baserock/genivi-demo-platform -- name: dbus-python - repo: upstream:dbus-python - ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58 - unpetrify-ref: dbus-python-1.2.0 - build-system: autotools diff --git a/strata/genivi-demo-platform-libs/dbus-c++.morph b/strata/genivi-demo-platform-libs/dbus-c++.morph deleted file mode 100644 index bd805ebf..00000000 --- a/strata/genivi-demo-platform-libs/dbus-c++.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: dbus-c++ -kind: chunk -description: libdbus-c++ and dbusxx-xml2cpp tool -build-system: autotools -configure-commands: -- autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-ecore -post-install-commands: -- install tools/dbusxx-xml2cpp "$DESTDIR/$PREFIX"/bin/dbusxx-xml2cpp diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph deleted file mode 100644 index f58b8a6b..00000000 --- a/strata/genivi-demo-platform.morph +++ /dev/null @@ -1,42 +0,0 @@ -name: genivi-demo-platform -kind: stratum -description: Components which make up the GENIVI demo platform. -build-depends: -- morph: strata/genivi-demo-platform-libs.morph -- morph: strata/qt5-tools.morph -- morph: strata/qt5-tools-qtmultimedia.morph -- morph: strata/qt5-tools-qtwebkit.morph -- morph: strata/genivi.morph -- morph: strata/wayland-generic.morph -- morph: strata/weston-genivi.morph -chunks: -- name: browser-poc - morph: strata/genivi-demo-platform/browser-poc.morph - repo: upstream:genivi/browser-poc - ref: d90501f8bd3edcd35eae72efbfb4583ba8f3cdfc - unpetrify-ref: baserock/genivi/genivi-demo-platform - submodules: - documentation/designdocument/cls: - url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git -- name: audiomanager-poc - morph: strata/genivi-demo-platform/audiomanager-poc.morph - repo: upstream:audiomanager - ref: bb65a4d0a18667baa64e5ba40104dc2cda06b299 - unpetrify-ref: baserock/genivi/genivi-demo-platform -- name: audiomanager@gdp - morph: strata/genivi-demo-platform/audiomanager@gdp.morph - repo: upstream:audiomanager - ref: ba709ee7d4f9f81af638a3d3c640b7152bbe32bc - unpetrify-ref: baserock/genivi/6.1-3-gba709ee-gdp -- name: audiomanagerdemo - repo: upstream:genivi/audiomanagerdemo - ref: 30b7817bb5c2de17c725d6624d073092d3a821c0 - unpetrify-ref: master - build-system: qmake - build-depends: - - audiomanager@gdp -- name: genivi-demo-platform-hmi - morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph - repo: upstream:genivi/genivi-demo-platform-hmi - ref: fd2c954165b0c0f7f4d9e94e8c9c3c8541a53e79 - unpetrify-ref: master diff --git a/strata/genivi-demo-platform/audiomanager-poc.morph b/strata/genivi-demo-platform/audiomanager-poc.morph deleted file mode 100644 index 6974705b..00000000 --- a/strata/genivi-demo-platform/audiomanager-poc.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: audiomanager-poc -kind: chunk -pre-configure-commands: -- sed 's:/opt/:/usr/lib/:g' $(git grep -l "/opt/") -configure-commands: -- cd AudioManagerPoC && qmake -makefile -build-commands: -- cd AudioManagerPoC && make -install-commands: -- cd AudioManagerPoC && make install INSTALL_ROOT="$DESTDIR" diff --git a/strata/genivi-demo-platform/audiomanager@gdp.morph b/strata/genivi-demo-platform/audiomanager@gdp.morph deleted file mode 100644 index d77d0e68..00000000 --- a/strata/genivi-demo-platform/audiomanager@gdp.morph +++ /dev/null @@ -1,14 +0,0 @@ -name: audiomanager@gdp -kind: chunk -configure-commands: -- | - cmake -DWITH_PULSE_ROUTING_PLUGIN=ON \ - -DWITH_PULSE_CONTROL_PLUGIN=ON \ - -DWITH_ENABLED_IPC=DBUS \ - -DWITH_DATABASE_STORAGE=OFF \ - -DWITH_DLT=OFF \ - -DCMAKE_INSTALL_PREFIX="$PREFIX" -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install diff --git a/strata/genivi-demo-platform/browser-poc.morph b/strata/genivi-demo-platform/browser-poc.morph deleted file mode 100644 index 1ca23d40..00000000 --- a/strata/genivi-demo-platform/browser-poc.morph +++ /dev/null @@ -1,29 +0,0 @@ -name: browser-poc -kind: chunk -description: The GENIVI browser proof-of-concept for the GENIVI Demo Platform. -configure-commands: -- qmake -d -r browser-poc.pro -build-commands: -- make all -install-commands: -- make INSTALL_ROOT="$DESTDIR" install -- mkdir -p "$DESTDIR/usr/lib/systemd/user" -- | - cat >"$DESTDIR/usr/lib/systemd/user/browser.service" <"$DESTDIR/usr/lib/systemd/user/demoui.service" <"$DESTDIR/usr/lib/systemd/user/gdp-hmi-launcher2.service" <"$DESTDIR/usr/lib/systemd/user/gdp-hmi-background.service" <"$DESTDIR/usr/lib/systemd/user/gdp-hmi-controller.service" <"$DESTDIR/usr/lib/systemd/user/gdp-hmi-panel.service" <"$DESTDIR/usr/lib/systemd/user/EGLWLMockNavigation.service" < "$DESTDIR/usr/lib/systemd/user/EGLWLInputEventExample.service" < "$DESTDIR/usr/lib/systemd/user/qml-example.service" < "$DESTDIR/usr/lib/systemd/user/PowerOff.service" <> ivi-shell/ivi-shell-weston.ini - [ivi-launcher] - workspace-id=0 - icon-id=4001 - icon=/usr/share/weston/icon_ivi_flower.png - path=/usr/bin/weston-flower - - [ivi-launcher] - workspace-id=0 - icon-id=4002 - icon=/usr/share/weston/icon_ivi_clickdot.png - path=/usr/bin/weston-clickdot - - [ivi-launcher] - workspace-id=1 - icon-id=4003 - icon=/usr/share/weston/icon_ivi_simple-egl.png - path=/usr/bin/weston-simple-egl - - [ivi-launcher] - workspace-id=1 - icon-id=4004 - icon=/usr/share/weston/icon_ivi_simple-shm.png - path=/usr/bin/weston-simple-shm - - [ivi-launcher] - workspace-id=2 - icon-id=4005 - icon=/usr/share/weston/icon_ivi_smoke.png - path=/usr/bin/weston-smoke - - [ivi-launcher] - workspace-id=2 - icon-id=4006 - icon=/usr/share/weston/terminal.png - path=/usr/bin/EGLWLMockNavigation - EOF - -# Generate gdp-weston config used for GENIVI Demo Platform -- | - cat < ivi-shell/gdp-weston.ini - [core] - shell=ivi-shell.so - - [ivi-shell] - ivi-module=ivi-controller.so - ivi-input-module=ivi-input-controller.so - - cursor-theme=default - cursor-size=32 - - base-layer-id=1000 - workspace-background-layer-id=2000 - workspace-layer-id=3000 - application-layer-id=4000 - - transition-duration=300 - EOF - -# Install both config files to decide later which one to use -- install -d "$DESTDIR/usr/share/doc/weston" -- install -m 0644 ivi-shell/ivi-shell-weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini" -- install -m 0644 ivi-shell/gdp-weston.ini "$DESTDIR/usr/share/doc/weston/gdp-weston.ini" -- cgit v1.2.1