X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Fscripts%2Fsetup_mm_packages.sh;h=f53025e2f76a93d12c5bab0a49b97cab554c5225;hb=8611adeb40fcfe033d687fbc02f8699e26e9c49d;hp=739a5c6d9bde1421adaab8b48d1a9a01ee1c3333;hpb=c8836925509d3de6655984fbf38875e13893871d;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
index 739a5c6d9..f53025e2f 100644
--- a/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
+++ b/meta-agl-bsp/meta-rcar-gen3/scripts/setup_mm_packages.sh
@@ -8,7 +8,7 @@ ARCHIVE_PREFIX_NAME="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux"
 ZIP_BUGFIX=$ARCHIVE_PREFIX_NAME"-weston5-20190516.zip"
 TAR_BUGFIX=$ARCHIVE_PREFIX_NAME"-20190516.tar.gz"
 
-COPY_SCRIPT="$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
+COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
 
 test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs
 DOWNLOAD_DIR=${XDG_DOWNLOAD_DIR:-$HOME/Downloads}
@@ -44,6 +44,9 @@ function log() {
 }
 
 function copy_mm_packages() {
+	# first clean up workdir
+	[[ -d $EXTRACT_DIR ]] && rm -r $EXTRACT_DIR
+
     if [ -f $DOWNLOAD_DIR/$ZIP_1 -a -f $DOWNLOAD_DIR/$ZIP_2 ]; then
         mkdir -p $EXTRACT_DIR
         cp --update $DOWNLOAD_DIR/$ZIP_1 $EXTRACT_DIR
@@ -63,7 +66,7 @@ function copy_mm_packages() {
     fi
 
     if [ -f $COPY_SCRIPT ]; then
-        cd $METADIR/meta-renesas-rcar-gen3/
+        cd $METADIR/bsp/meta-renesas-rcar-gen3/
         $COPY_SCRIPT -d -f $EXTRACT_DIR
         cd ..
     else
@@ -105,7 +108,7 @@ function copy_mm_packages() {
     find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec mv -t $EXTRACT_DIR {} \;
     for f in `find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec basename {} \;`
     do
-        mv $EXTRACT_DIR/${f} "$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4}
+        mv $EXTRACT_DIR/${f} "$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4}
     done;
 
     #Clean
@@ -113,4 +116,7 @@ function copy_mm_packages() {
     rm -r $EXTRACT_DIR/$GFX_ARCHIVE_NAME
 
     log   "The graphics hotfix for BUG SPEC-2253 has been successfully applied."
+
+	# clean up workdir if not done by older script
+	rm -r $EXTRACT_DIR
 }