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=d7c609e3a81ff3ebf7105d36c2c2d171c266fa47;hb=1312e1fd39c0fb9193fe3d7f6f76d3ca432d4802;hp=29d88257c5a34d1d8364c158016f8945711471a8;hpb=43a4eeef40a0db94240cfc07bdb74f9abcc89798;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 29d88257c..d7c609e3a 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
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston5-20190802.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston5-20191021.zip"
+ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston8-20200923.zip"
+ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston8-20200923.zip"
 
-COPY_SCRIPT="$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
+COPY_SCRIPT="$METADIR/bsp/meta-renesas/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}
@@ -39,13 +39,25 @@ function log() {
 }
 
 function copy_mm_packages() {
-	# first clean up workdir
-	[[ -d $EXTRACT_DIR ]] && rm -r $EXTRACT_DIR
-
+    # first clean up workdir on need
+    if [ -d $EXTRACT_DIR ]; then
+        if [ -f $EXTRACT_DIR/$ZIP_1 -a -f $EXTRACT_DIR/$ZIP_2 ]; then
+            log   "The graphics and multimedia acceleration packages for R-Car Gen3 look already installed."
+            log   "To force their reinstallation, please, remove manually the directory:"
+            log   "           $EXTRACT_DIR"
+            log
+            return 0
+        fi
+        rm -r $EXTRACT_DIR
+    fi
     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
         cp --update $DOWNLOAD_DIR/$ZIP_2 $EXTRACT_DIR
+        cd $EXTRACT_DIR
+        unzip -o $ZIP_1
+        unzip -o $ZIP_2
+        cd -
     else
         error "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_1+"\" NOT EXTRACTING CORRECTLY"
         error "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_2+"\" NOT EXTRACTING CORRECTLY"
@@ -61,7 +73,7 @@ function copy_mm_packages() {
     fi
 
     if [ -f $COPY_SCRIPT ]; then
-        cd $METADIR/bsp/meta-renesas-rcar-gen3/
+        cd $METADIR/bsp/meta-renesas/
         $COPY_SCRIPT -d -f $EXTRACT_DIR
         cd ..
     else