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=d7c609e3a81ff3ebf7105d36c2c2d171c266fa47;hb=1312e1fd39c0fb9193fe3d7f6f76d3ca432d4802;hp=798ebfb8a3e337af2ff7bc0696bcfafc013ba89a;hpb=7489fa14eee5819f8fd965c3f8f53e62ce7fcfd2;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 798ebfb8a..d7c609e3a 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,14 +1,9 @@
 #!/bin/bash
 
-ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston5-20190212.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston5-20190212.zip"
+ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-weston8-20200923.zip"
+ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston8-20200923.zip"
 
-#BUG FIX PART (AGL JIRA SPEC-2253)
-ARCHIVE_PREFIX_NAME="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux"
-ZIP_BUGFIX=$ARCHIVE_PREFIX_NAME"-weston5-20190516.zip"
-TAR_BUGFIX=$ARCHIVE_PREFIX_NAME"-20190516.tar.gz"
-
-COPY_SCRIPT="$METADIR/bsp/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}
@@ -44,10 +39,25 @@ function log() {
 }
 
 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"
@@ -63,54 +73,11 @@ function copy_mm_packages() {
     fi
 
     if [ -f $COPY_SCRIPT ]; then
-        cd $METADIR/bsp/meta-renesas-rcar-gen3/
+        cd $METADIR/bsp/meta-renesas/
         $COPY_SCRIPT -d -f $EXTRACT_DIR
         cd ..
     else
         log   "scripts to copy drivers for Gen3 not found."
         return 1
     fi
-
-    #BUG FIX PART (AGL JIRA SPEC-2253)
-    #Detect supported machine
-    if [ $MACHINE == "m3ulcb" ] || [ $MACHINE == "h3ulcb" ]
-    then
-        GFX_ARCHIVE_NAME="EVARTM0RC779*GLPG0001SL41C_2_0_8_C";
-        GFX_BINARIES_NAME="EVA_r8a*_linux_gsx_binaries_gles.tar.bz2";
-    else
-        log "Note: graphics bug (SPEC-2253) will not be fixed for the requested machine ($MACHINE)."
-    fi
-
-    #Get binary file
-    if [ -f $DOWNLOAD_DIR/$ZIP_BUGFIX ]; then
-        cp --update $DOWNLOAD_DIR/$ZIP_BUGFIX $EXTRACT_DIR
-    else
-        error "ERROR: FILE '$DOWNLOAD_DIR/$ZIP_BUGFIX' NOT FOUND."
-        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  "This archive should be stored in your '$DOWNLOAD_DIR' directory."
-        error  "Requested archive name: '$ZIP_BUGFIX'"
-        return 1
-    fi
-
-    #Extract the only the needed GFX binaries
-    unzip -d $EXTRACT_DIR -oq $EXTRACT_DIR/$ZIP_BUGFIX
-    tar -C $EXTRACT_DIR -zxf $EXTRACT_DIR/$TAR_BUGFIX
-    mv $EXTRACT_DIR/$ARCHIVE_PREFIX_NAME/*/*.zip $EXTRACT_DIR
-
-    #Manage the needed GFX binaries
-    find $EXTRACT_DIR -name "$GFX_ARCHIVE_NAME.zip" -exec unzip -d $EXTRACT_DIR -oq {} \;
-    find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec mv -t $EXTRACT_DIR {} \;
-    for f in `find $EXTRACT_DIR -name "$GFX_BINARIES_NAME" -exec basename {} \;`
-    do
-        mv $EXTRACT_DIR/${f} "$METADIR/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module"/${f:4}
-    done;
-
-    #Clean
-    rm -r $EXTRACT_DIR/$ARCHIVE_PREFIX_NAME
-    rm -r $EXTRACT_DIR/$GFX_ARCHIVE_NAME
-
-    log   "The graphics hotfix for BUG SPEC-2253 has been successfully applied."
 }