packagegroup: core: devel: add agl-service-network-tools package

[AGL/meta-agl.git] / meta-agl-bsp / meta-rcar-gen3 / scripts / setup_mm_packages.sh

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 242c0f0..c886187 100644 (file)
--- 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-weston2-20170904.zip"
-ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-weston2-20170904.zip"
+ZIP_1="R-Car_Gen3_Series_Evaluation_Software_Package_for_Linux-20180423.zip"
+ZIP_2="R-Car_Gen3_Series_Evaluation_Software_Package_of_Linux_Drivers-20180423.zip"
 
 COPY_SCRIPT="$METADIR/meta-renesas-rcar-gen3/meta-rcar-gen3/docs/sample/copyscript/copy_evaproprietary_softwares.sh"
 
@@ -15,10 +15,14 @@ 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;;
+                       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)
@@ -35,30 +39,30 @@ function log() {
 }
 
 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/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 $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/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-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 $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
 }