From ea431f4e844bd85e4d7830ec1e7afce39e33af11 Mon Sep 17 00:00:00 2001 From: Jonathan Maw Date: Tue, 5 May 2015 16:28:04 +0000 Subject: gdp-hmi: Fix images failing to install in a way that works 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. --- strata/genivi-demo-platform/genivi-demo-platform-hmi.morph | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph index 2c7dab1d..9e319372 100644 --- a/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph +++ b/strata/genivi-demo-platform/genivi-demo-platform-hmi.morph @@ -42,12 +42,10 @@ install-commands: - cd app/gdp-hmi-background && make INSTALL_ROOT=$DESTDIR install - cd app/gdp-hmi-launcher && make INSTALL_ROOT=$DESTDIR install - cd app/gdp-hmi-panel && make INSTALL_ROOT=$DESTDIR install -- mkdir -p $DESTDIR/usr/share/gdp/gdp-hmi-background -- mkdir -p $DESTDIR/usr/share/gdp/gdp-hmi-launcher -- mkdir -p $DESTDIR/usr/share/gdp/gdp-hmi-panel -- cp -a app/gdp-hmi-background/assets/* $DESTDIR/usr/share/gdp/gdp-hmi-background/ -- cp -a app/gdp-hmi-launcher/assets/* $DESTDIR/usr/share/gdp/gdp-hmi-launcher/ -- cp -a app/gdp-hmi-panel/assets/* $DESTDIR/usr/share/gdp/gdp-hmi-panel/ +- mkdir -p $DESTDIR/usr/share/gdp +- cp -a app/gdp-hmi-background/assets/* $DESTDIR/usr/share/gdp/ +- cp -a app/gdp-hmi-launcher/assets/* $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-launcher.service" <