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=16613bf8c0909ef7fe7cd0544945ce348b8714c5;hb=refs%2Fchanges%2F67%2F13667%2F1;hp=bd82f4e36a4219b9c24dd2bb1dd3fb8a26760e1f;hpb=06f0b1a602c4c6179b22e613160ac4298db8ff3a;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 bd82f4e36..16613bf8c 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,38 +1,68 @@
 #!/bin/bash
 
-ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-20160906.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-20160906.zip"
+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"
 
-COPY_SCRIPT="$METADIR/meta-rcar/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
+COPY_SCRIPT="$METADIR/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}
+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;;
+			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)
+color_red=$(color bold 1)
+color_none=$(color none)
+
+function error() {
+	echo "${color_red}$@${color_none}" >&2
+}
+
+function log() {
+	echo "$@" >&2
+}
 
 function copy_mm_packages() {
-        if [ ! -d $METADIR/binary-tmp ]; then
-                if [ -f $DOWNLOAD_DIR/$ZIP_1 -a -f $DOWNLOAD_DIR/$ZIP_2 ]; then
-                        mkdir $METADIR/binary-tmp
-                        unzip -o $DOWNLOAD_DIR/$ZIP_1 -d $METADIR/binary-tmp
-                        unzip -o $DOWNLOAD_DIR/$ZIP_2 -d $METADIR/binary-tmp
-                else
-                        echo -n "The graphics and multimedia acceleration packages for "
-                        echo -e "the R-Car Gen3 board can be download from :"
-                        echo -e "  <http://www.renesas.com/secret/r_car_download/rcar_demoboard.jsp>"
-                        echo -e
-                        echo -n "These 2 files from there should be store in your"
-                        echo -e "'$DOWNLOAD_DIR' directory."
-                        echo -e "  $ZIP_1"
-                        echo -e "  $ZIP_2"
-                        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 2.19 can be downloaded from:"
+                log   " <https://www.renesas.com/en-us/solutions/automotive/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/meta-rcar/
-                $COPY_SCRIPT -d -f $METADIR/binary-tmp
+                cd $METADIR/meta-renesas-rcar-gen3/
+                $COPY_SCRIPT -d -f $EXTRACT_DIR
                 cd ..
         else
-                echo "scripts to copy drivers for Gen3 not found."
+                log   "scripts to copy drivers for Gen3 not found."
                 return 1
         fi
 }