Merge from develop to master

Build/Dockerfile

@@ -1,22 +1,23 @@
 FROM ubuntu:20.04
 ENV TZ=America/Vancouver
-ENV WORK=/home/yocto/rzv_vlp_v3.0.4
+ENV WORK=/home/yocto/rzv_vlp_v3.0.6
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # update and upgrade to latest & greatest
-RUN apt -y update && apt -y upgrade
+RUN apt-get -y update && apt-get -y upgrade
 # Install packages
-RUN apt-get -y install gawk wget git-core diffstat unzip texinfo \
-		       gcc-multilib build-essential chrpath socat cpio python python3 \
-	     	       python3-pip python3-pexpect xz-utils debianutils iputils-ping \
-	     	       python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 \
-	     	       xterm p7zip-full libyaml-dev screen ncurses-bin libncurses-dev \
-		       device-tree-compiler locales vim git findutils exuberant-ctags \
-		       cscope tmux sudo tree
+RUN apt-get -y install --no-install-recommends \
+				gawk wget git-core diffstat unzip texinfo \
+				gcc-multilib build-essential chrpath socat cpio python python3 \
+				python3-pip python3-pexpect xz-utils debianutils iputils-ping \
+				python3-git python3-jinja2 libegl1-mesa libsdl1.2-dev pylint3 \
+				xterm p7zip-full libyaml-dev screen ncurses-bin libncurses-dev \
+				device-tree-compiler locales vim git findutils exuberant-ctags \
+				cscope tmux sudo tree file
 # Set the locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 #create user yocto
 RUN useradd -m yocto -s /bin/bash
 RUN echo yocto:yocto | chpasswd
@@ -33,7 +34,6 @@ RUN mkdir -p $WORK/build/downloads && \
 
 COPY start.sh /home/yocto/
 COPY exec.sh /home/yocto/
-COPY inc/ /home/yocto/inc/
 # copy mistysom layer from the submodule
 COPY --chown=yocto:yocto meta-mistysom $WORK/meta-mistysom
 COPY --chown=yocto:yocto meta-mistylwb5p $WORK/meta-mistylwb5p

Build/README.md

@@ -1,7 +1,7 @@
 
 # README
 
-## VerifiedLinuxPackage_v3.0.0
+## VerifiedLinuxPackage_v3.0.6
 
 ### Description
 
@@ -66,7 +66,7 @@ Make sure to work with files on Linux mounts (avoid use of mounted Windows parti
 
 ### Files 
 Filesthat get downloaded by the Dockerfile on build are stored under:
-Z:\WebDownload\mh11\rzv2l\VerifiedLinuxPackage_v3.0.0
+Z:\WebDownload\mh11\rzv2l\VerifiedLinuxPackage_v3.0.6
 
 ### Run time information
  - `./build.sh` Builds the container image from the Dockerfile and downloads the required files, from the above resource

Build/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-NAME="rzv2l_vlp_v3.0.4"
+NAME="rzv2l_vlp_v3.0.6"
 INCLUDE_BRANCH=0
 Help()
 {

Build/exec.sh

@@ -20,13 +20,15 @@ then
 	echo "Unable to obtain full acess  permissions to 'output' and its sub directories, edit the permissions of 'output' accordingly! exit"
 	exit -1
 fi
+
+mkdir -p $WORK/build/sstate-cache
+mkdir -p $WORK/build/downloads
 if [[ ! -w $WORK/build/sstate-cache || ! -w $WORK/build/downloads ]];
 then
 	echo "Unable to obtain write permissions to 'cache' and its sub directories, edit the permissions of 'cache' accordingly! exit"
 	exit -1
 fi
 
-
 ./start.sh
 if [ -z $NO ];
 then

Build/prepare_yocto_env.sh

@@ -1,35 +1,38 @@
 #!/bin/sh
 
+set -e
+set -x
+
 # download
-wget https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.4/RTK0EF0045Z0024AZJ-v3.0.4.zip # BSP
-wget https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.4/RTK0EF0045Z13001ZJ-v1.1.0_EN.zip # Graphics package Evaluation version
-wget https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.4/RTK0EF0045Z15001ZJ-v1.1.0_EN.zip # VIDEO CODEC PACKAGE Evaluation version
-wget https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.4/r11an0549ej0740-rzv2l-drpai-sp.zip # DRPAI stuff for V2L
+wget -q https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.6/RTK0EF0045Z0024AZJ-v3.0.6.zip # BSP
+wget -q https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.6/RTK0EF0045Z13001ZJ-v1.2.2_EN.zip # Graphics package Evaluation version
+wget -q https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.6/RTK0EF0045Z15001ZJ-v1.2.2_EN.zip # VIDEO CODEC PACKAGE Evaluation version
+wget -q https://remote.mistywest.com/download/mh11/rzv2l/VerifiedLinuxPackage_v3.0.6/r11an0549ej0750-rzv2l-drpai-sp.zip # DRPAI stuff for V2L
 
 # extract
 cd $WORK || exit 1
 
-unzip -o ~/RTK0EF0045Z0024AZJ-v3.0.4.zip -d ~
-tar zxvf ~/RTK0EF0045Z0024AZJ-v3.0.4/rzv_vlp_v3.0.4.tar.gz --no-same-owner
+unzip -o ~/RTK0EF0045Z0024AZJ-v3.0.6.zip -d ~
+tar zxvf ~/RTK0EF0045Z0024AZJ-v3.0.6/rzv_vlp_v3.0.6.tar.gz --no-same-owner
 
-unzip -o ~/RTK0EF0045Z13001ZJ-v1.1.0_EN.zip -d ~
-tar zxvf ~/RTK0EF0045Z13001ZJ-v1.1.0_EN/meta-rz-features_graphics_v1.1.0.tar.gz --no-same-owner
+unzip -o ~/RTK0EF0045Z13001ZJ-v1.2.2_EN.zip -d ~
+tar zxvf ~/RTK0EF0045Z13001ZJ-v1.2.2_EN/meta-rz-features_graphics_v1.2.2.tar.gz --no-same-owner
 
-unzip -o ~/RTK0EF0045Z15001ZJ-v1.1.0_EN.zip -d ~
-tar zxvf ~/RTK0EF0045Z15001ZJ-v1.1.0_EN/meta-rz-features_codec_v1.1.0.tar.gz --no-same-owner
+unzip -o ~/RTK0EF0045Z15001ZJ-v1.2.2_EN.zip -d ~
+tar zxvf ~/RTK0EF0045Z15001ZJ-v1.2.2_EN/meta-rz-features_codec_v1.2.2.tar.gz --no-same-owner
 
-unzip -o ~/r11an0549ej0740-rzv2l-drpai-sp.zip -d ~/r11an0549ej0740-rzv2l-drpai-sp
-tar xvf ~/r11an0549ej0740-rzv2l-drpai-sp/rzv2l_drpai-driver/meta-rz-drpai.tar.gz -C /home/yocto/rzv_vlp_v3.0.4/ --no-same-owner
+unzip -o ~/r11an0549ej0750-rzv2l-drpai-sp.zip -d ~/r11an0549ej0750-rzv2l-drpai-sp
+tar xvf ~/r11an0549ej0750-rzv2l-drpai-sp/rzv2l_drpai-driver/meta-rz-drpai.tar.gz -C $WORK --no-same-owner
 
 # clean up
 echo "Cleaning Up..."
-rm -rf ~/RTK0EF0045Z0024AZJ-v3.0.4.zip
-rm -rf ~/RTK0EF0045Z0024AZJ-v3.0.4
-rm -rf ~/RTK0EF0045Z13001ZJ-v1.1.0_EN.zip
-rm -rf ~/RTK0EF0045Z13001ZJ-v1.1.0_EN
-rm -rf ~/RTK0EF0045Z15001ZJ-v1.1.0_EN.zip
-rm -rf ~/RTK0EF0045Z15001ZJ-v1.1.0_EN
-rm -rf ~/r11an0549ej0740-rzv2l-drpai-sp.zip
-rm -rf ~/r11an0549ej0740-rzv2l-drpai-sp
+rm -rf ~/RTK0EF0045Z0024AZJ-v3.0.6.zip
+rm -rf ~/RTK0EF0045Z0024AZJ-v3.0.6
+rm -rf ~/RTK0EF0045Z13001ZJ-v1.2.2_EN.zip
+rm -rf ~/RTK0EF0045Z13001ZJ-v1.2.2_EN
+rm -rf ~/RTK0EF0045Z15001ZJ-v1.2.2_EN.zip
+rm -rf ~/RTK0EF0045Z15001ZJ-v1.2.2_EN
+rm -rf ~/r11an0549ej0750-rzv2l-drpai-sp.zip
+rm -rf ~/r11an0549ej0750-rzv2l-drpai-sp
 
 echo "Wrapping Layer..."

Build/run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #set -e
-DIRNAME="rzv_vlp_v3.0.4"
-NAME="rzv2l_vlp_v3.0.4"
+DIRNAME="rzv_vlp_v3.0.6"
+NAME="rzv2l_vlp_v3.0.6"
 usage() {
     echo "    Usage:
     $ $0 -b|--branch :	attach current branch name when running the container

Build/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-NAME="rzv_vlp_v3.0.4"
+NAME="rzv_vlp_v3.0.6"
 set -e
 #Check hostname is a hexadecimal number of 12 
 SOMHOSTNAME="MistySOM-V2L"
@@ -50,6 +50,8 @@ PREFERRED_RPROVIDER_wireless-regdb-static = "wireless-regdb"
 
 MACHINE_FEATURES_append = " docker"
 DISTRO_FEATURES_append = " virtualization"
+
+CIP_MODE = "Bullseye"
 EOT
 
 # Set default root password
@@ -74,16 +76,12 @@ rm -rf ${WORK}/meta-mistylwb5p/meta-summit-radio-pre-3.4/recipes-packages/summit
 echo "LAYERSERIES_COMPAT_qt5-layer = \"dunfell\"" >> ${WORK}/meta-qt5/conf/layer.conf
 echo "LAYERSERIES_COMPAT_summit-radio-pre-3.4 = \"dunfell\"" >> ${WORK}/meta-mistylwb5p/meta-summit-radio-pre-3.4/conf/layer.conf
 
-echo "    ------------------------------------------------
-    SETUP SCRIPT BUILD ENVIRONMENT SETUP SUCCESSFUL!
-    run the following commands to start the build:
-    'cd ${WORK}'
-    'source poky/oe-init-build-env'
-    'bitbake mistysom-image'"
-cd ~
-
-# Copy inc files to fix the shortcomings in Renesas' BSP
-cp ~/inc/openssl.inc ~/rzv_vlp_v3.0.4/meta-renesas/meta-rz-common/recipes-debian/buster/sources/
-cp ~/inc/glib2.0.inc ~/rzv_vlp_v3.0.4/meta-renesas/meta-rz-common/recipes-debian/buster/sources/
 git config --global --add safe.directory "*"
+cd ~
 
+echo "    ------------------------------------------------
+	SETUP SCRIPT BUILD ENVIRONMENT SETUP SUCCESSFUL!
+	run the following commands to start the build:
+	'cd ${WORK}'
+	'source poky/oe-init-build-env'
+	'bitbake mistysom-image'"