X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Fscripts%2Fsetup_mm_packages.sh;h=a6fd42f5a1a332cd870abfcbabc27a3cf2d14289;hb=c85dca585cdae4a9062aaa6c38c2534173f07f48;hp=50d48cd6adb49168af6a04c41a117204eeb10134;hpb=bc850782950ab2b359482667c079dce541d4eb3a;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 50d48cd6a..a6fd42f5a 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
@@ -7,30 +7,38 @@ COPY_SCRIPT="$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscri
 
 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
+
 
 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 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 " 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
         fi
 
         if [ -f $COPY_SCRIPT ]; then
                 cd $METADIR/meta-renesas-rcar-gen3/
-                $COPY_SCRIPT -d -f $METADIR/binary-tmp
+                $COPY_SCRIPT -d -f $EXTRACT_DIR
                 cd ..
         else
                 echo "scripts to copy drivers for Gen3 not found."