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=29d88257c5a34d1d8364c158016f8945711471a8;hb=43a4eeef40a0db94240cfc07bdb74f9abcc89798;hp=8bc2c35749c5073287857245da4a7392df8f0f0e;hpb=8f73d089abd5221b92ead3ba01d9176bbd1067d8;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 8bc2c3574..29d88257c 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-20170427.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-20170427.zip"
+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"
 
-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}
@@ -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,38 +31,41 @@ 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() {
-        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
-        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 2.19 can be downloaded from:"
-                log   " <https://www.renesas.com/solutions/automotive/rcar-demoboard.html>"
-                log
-                error  "These 2 files from there should be stored in your"
-                error  "'$DOWNLOAD_DIR' directory."
-                error  "  $ZIP_1"
-                error  "  $ZIP_2"
-                return 1
-        fi
+	# first clean up workdir
+	[[ -d $EXTRACT_DIR ]] && rm -r $EXTRACT_DIR
 
-        if [ -f $COPY_SCRIPT ]; then
-                cd $METADIR/meta-renesas-rcar-gen3/
-                $COPY_SCRIPT -d -f $EXTRACT_DIR
-                cd ..
-        else
-                log   "scripts to copy drivers for Gen3 not found."
-                return 1
-        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
+    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/us/en/solutions/automotive/rcar-download/rcar-demoboard-2.html>"
+        log
+        error  "These 2 files from there should be stored in your"
+        error  "'$DOWNLOAD_DIR' directory."
+        error  "  $ZIP_1"
+        error  "  $ZIP_2"
+        return 1
+    fi
+
+    if [ -f $COPY_SCRIPT ]; then
+        cd $METADIR/bsp/meta-renesas-rcar-gen3/
+        $COPY_SCRIPT -d -f $EXTRACT_DIR
+        cd ..
+    else
+        log   "scripts to copy drivers for Gen3 not found."
+        return 1
+    fi
 }