summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-05 15:24:44 +0000
committerJames Thomas <james.thomas@codethink.co.uk>2015-05-20 14:06:57 +0000
commit082293a0d1a7741f90087f77cc0606b7cceb662e (patch)
tree31f0aaf6aa46a52f2fd03c7541f4e186e0575bdf
parent26623a9b021499fd0f1e5ed82ca69ef3d7884517 (diff)
downloaddefinitions-082293a0d1a7741f90087f77cc0606b7cceb662e.tar.gz
gdp-hmi: Fix images failing to install to destination
The destination must be the same for all three dirs, even if that means files overwrite each other. Since `cp` refuses to do that as part of the same command, I run it once for each subdir.
-rw-r--r--strata/genivi-demo-platform/genivi-demo-platform-hmi.morph4
1 files changed, 3 insertions, 1 deletions
diff --git a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
index b30e72de..d2cee815 100644
--- a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
+++ b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph
@@ -46,7 +46,9 @@ install-commands:
- cd app/gdp-hmi-panel && make INSTALL_ROOT=$DESTDIR install
- cd app/qml-example && make INSTALL_ROOT=$DESTDIR install
- mkdir -p $DESTDIR/usr/share/gdp
-- cp -a app/*/assets/* $DESTDIR/usr/share/gdp/
+- cp -a app/gdp-hmi-background/assets/* $DESTDIR/usr/share/gdp/
+- cp -a app/gdp-hmi-launcher2/content/images/* $DESTDIR/usr/share/gdp/
+- cp -a app/gdp-hmi-panel/assets/* $DESTDIR/usr/share/gdp/
- mkdir -p "$DESTDIR/usr/lib/systemd/user"
- |
cat >"$DESTDIR/usr/lib/systemd/user/gdp-hmi-launcher2.service" <<EOF