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=ee678d8c5b5fef0ee9574222237322d6635a4d80;hb=refs%2Fchanges%2F71%2F9071%2F5;hp=99b012f7fe286aacc34bd1e25c01a041ee0dd9ba;hpb=4cbd74eaa4a242a7e967a696ca2dcd10e60f03fd;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 99b012f7f..ee678d8c5 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,7 +1,7 @@
 #!/bin/bash
 
-ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-20170125.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-20170125.zip"
+ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-20170324.zip"
+ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-20170324.zip"
 
 COPY_SCRIPT="$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
 
@@ -9,24 +9,30 @@ test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME
 DOWNLOAD_DIR=${XDG_DOWNLOAD_DIR:-$HOME/Downloads}
 EXTRACT_DIR=$METADIR/binary-tmp
 
+
 function copy_mm_packages() {
-        if [ ! -d $EXTRACT_DIR ]; then
-                if [ -f $DOWNLOAD_DIR/$ZIP_1 -a -f $DOWNLOAD_DIR/$ZIP_2 ]; then
-                        mkdir $EXTRACT_DIR
-                        unzip -o $DOWNLOAD_DIR/$ZIP_1 -d $EXTRACT_DIR
-                        unzip -o $DOWNLOAD_DIR/$ZIP_2 -d $EXTRACT_DIR
-                else
-                        echo -n "The graphics and multimedia acceleration packages for "
-                        echo -e "the R-Car Gen3 board can be downloaded from:"
-                        echo -e " https://www.renesas.com/en-us/software/D6000821.html"
-                        echo -e " https://www.renesas.com/en-us/software/D6000822.html"
-                        echo -e
-                        echo -n "These 2 files from there should be stored in your"
-                        echo -e "'$DOWNLOAD_DIR' directory."
-                        echo -e "  $ZIP_1"
-                        echo -e "  $ZIP_2"
-                        return 1
+        if [ -f $DOWNLOAD_DIR/$ZIP_1 -a -f $DOWNLOAD_DIR/$ZIP_2 ]; then
+                mkdir -p $EXTRACT_DIR
+                unzip -n $DOWNLOAD_DIR/$ZIP_1 -d $EXTRACT_DIR
+                if [ $? -ne 0 ]; then
+                    echo -e "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_1+"\" NOT EXTRACTING CORRECTLY"
+                    return 1
+                fi
+                unzip -n $DOWNLOAD_DIR/$ZIP_2 -d $EXTRACT_DIR
+                if [ $? -ne 0 ]; then
+                    echo -e "ERROR: FILES \""+$DOWNLOAD_DIR/$ZIP_2+"\" NOT EXTRACTING CORRECTLY"
+                    return 1
                 fi
+        else
+                echo -n "The graphics and multimedia acceleration packages for "
+                echo -e "the R-Car Gen3 board can be downloaded 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 stored in your"
+                echo -e "'$DOWNLOAD_DIR' directory."
+                echo -e "  $ZIP_1"
+                echo -e "  $ZIP_2"
+                return 1
         fi
 
         if [ -f $COPY_SCRIPT ]; then