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=89238e5b0f590eaeb75869b92d5d4e4a7595eb51;hb=4d989ef3ad5d75453b4710bc06cefeba0d79fa32;hp=dddb3379ce9bbb65e42528f7ed00622ae2658a5c;hpb=2019c40c910bc469b65f0f5adfa196a77dc339b1;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 dddb3379c..89238e5b0 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-weston2-20170904.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston2-20170904.zip"
+ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston8-20210121.zip"
+ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston8-20210121.zip"
 
-COPY_SCRIPT="$METADIR/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}
@@ -12,14 +12,18 @@ EXTRACT_DIR=$METADIR/binary-tmp
 stdout_in_terminal=1
 [[ -t 1 ]] && stdout_in_terminal=1
 function color {
-	[[ $stdout_in_terminal == 0 ]] && return
-	for k in $*; do
-		case $k in
-			bold) tput bold 2>/dev/null;;
-			none) tput sgr0 2>/dev/null;;
-			*) tput setaf $k 2>/dev/null;;
-		esac
-	done
+    [[ $stdout_in_terminal == 0 ]] && return
+    for k in $*; do
+        case $k in
+            bold) tput bold;;
+            none) tput sgr0;;
+            *) tput setaf $k;;
+        esac
+        if [[ $? != 0 ]]; then
+            echo "tput: terminal doesn't support color settings, continuing" >&2
+            true
+        fi
+    done
 }
 color_green=$(color bold 2)
 color_yellow=$(color bold 3)
@@ -27,24 +31,39 @@ color_red=$(color bold 1)
 color_none=$(color none)
 
 function error() {
-	echo "${color_red}$@${color_none}" >&2
+    echo "${color_red}$@${color_none}" >&2
 }
 
 function log() {
-	echo "$@" >&2
+    echo "$@" >&2
 }
 
 function copy_mm_packages() {
+    # 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"
         log   "The graphics and multimedia acceleration packages for "
         log   "the R-Car Gen3 board BSP can be downloaded from:"
-        log   "<https://www.renesas.com/en-us/solutions/automotive/rcar-demoboard-2.html>"
+        log   "<https://www.renesas.com/us/en/application/automotive/r-car-h3-m3-documents-software>"
         log
         error  "These 2 files from there should be stored in your"
         error  "'$DOWNLOAD_DIR' directory."
@@ -54,7 +73,7 @@ function copy_mm_packages() {
     fi
 
     if [ -f $COPY_SCRIPT ]; then
-        cd $METADIR/meta-renesas-rcar-gen3/
+        cd $METADIR/bsp/meta-renesas/
         $COPY_SCRIPT -d -f $EXTRACT_DIR
         cd ..
     else
@@ -62,3 +81,4 @@ function copy_mm_packages() {
         return 1
     fi
 }
+