Merge pull request #28 from MistySOM/develop

Author: matinlotfali

.github/workflows/build-yocto.yml

@@ -11,10 +11,12 @@ on:
 
 jobs:
   build-yocto:
-    runs-on: self-hosted
+    runs-on: DC02
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: recursive
 
     - name: Build the Docker image
       run: cd Build && ./build.sh; 
@@ -29,4 +31,6 @@ jobs:
         path: |
           Build/output/images/smarc-rzv2l/Image-smarc-rzv2l.bin
           Build/output/images/smarc-rzv2l/r9a07g054l2-smarc.dtb
+          Build/output/images/smarc-rzv2l/r9a07g054l2-smarc-ar0234.dtb
+          Build/output/images/smarc-rzv2l/r9a07g054l2-smarc-imx462.dtb
           Build/output/images/smarc-rzv2l/mistysom-image-smarc-rzv2l.tar.bz2

.github/workflows/check-submodule.yml

@@ -29,9 +29,16 @@ jobs:
           # Set the value of the environment variable with the same name as the variable
           echo "target_branch=$target_branch" >> $GITHUB_ENV
           
-      - name: 'Check Submodule Branch'
+      - name: 'Check meta-mistysom Submodule Branch'
         uses: jtmullen/[email protected]
         with:
           path: Build/meta-mistysom
           branch: ${{ env.target_branch }}
           require_head: true
+
+      - name: 'Check meta-econsys Submodule Branch'
+        uses: jtmullen/[email protected]
+        with:
+          path: Build/meta-econsys
+          branch: ${{ env.target_branch }}
+          require_head: true

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "Build/meta-mistysom"]
 	path = Build/meta-mistysom
 	url = https://github.com/MistySOM/meta-mistysom.git
+[submodule "Build/meta-mistylwb5p"]
+	path = Build/meta-mistylwb5p
+	url = https://github.com/MistySOM/meta-mistylwb5p.git
+[submodule "Build/meta-econsys"]
+	path = Build/meta-econsys
+	url = https://github.com/MistySOM/meta-econsys.git

Build/Dockerfile

@@ -36,5 +36,7 @@ COPY start.sh /home/yocto/
 COPY exec.sh /home/yocto/
 # copy mistysom layer from the submodule
 COPY --chown=yocto:yocto meta-mistysom $WORK/meta-mistysom
+COPY --chown=yocto:yocto meta-mistylwb5p $WORK/meta-mistylwb5p
+COPY --chown=yocto:yocto meta-econsys $WORK/meta-econsys
 
 CMD ["/home/yocto/exec.sh"]

Build/build.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
-git submodule sync
-git submodule update --init --recursive
-IMAGE_NAME="$(whoami)-rzv2l_vlp_v3.0.0"
+if [ "$1" == "-b" ]; then
+	IMAGE_NAME="$(whoami)-rzv2l_vlp_v3.0.0_$(git branch --show-current)"
+else
+	IMAGE_NAME="$(whoami)-rzv2l_vlp_v3.0.0"
+fi
 docker build -t ${IMAGE_NAME}:latest .
 (docker images | grep "^<none" | awk '{print $3}' | xargs docker rmi) || :

Build/meta-econsys

@@ -3,14 +3,15 @@
 
 usage() {
     echo "    Usage:
-    $ $0 -c|--cpath : path to local cache (download & sstate)
-    $ $0 -n|--no : starts container but does not invoke bitbake
-    $ $0 -s|--sdk : start in developer mode, 
-                    invokes building of SDK"
+    $ $0 -b|--branch :	attach current branch name when running the container
+    $ $0 -c|--cpath :	path to local cache (download & sstate)
+    $ $0 -n|--no :	starts container but does not invoke bitbake,
+				start in developer mode
+     $ $0 -s|--sdk :	invokes building of SDK
+    $ $0 -v|--verbose	run script in verbose mode"
 }
 #OUTDIR is bind mopunted and will contain the compiled output from the container
 OUTDIR='output'
-CONTNAME="$(whoami)-rzv2l_vlp_v3.0.0"
 test -t 1 && USE_TTY="-it"
 MPU="rzv2l"
 str="$*"
@@ -25,6 +26,10 @@ then
 fi
 while [[ $# -gt 0 ]]; do
     case $1 in
+      -b|--branch)
+        BRANCH="_$(git branch --show-current)"
+        shift #past argument
+      ;;
       -c|--cpath)
         CPATH="$2"
 	DLOAD="1"
@@ -34,12 +39,14 @@ while [[ $# -gt 0 ]]; do
       -n|--no)
         NO="1"
         shift #past argument
-        shift #past value
       ;;
       -s|--sdk)
         SDK="1"
         shift #past argument
-        shift #past value
+      ;;
+      -v|--verbose)
+        VERBOSE="1"
+        shift #past argument
       ;;
       -*|--*)
         echo "Unknown argument $1"
@@ -48,28 +55,36 @@ while [[ $# -gt 0 ]]; do
         ;;
     esac
 done
-#Create OUTDIR if iot doesn't exist
+CONTNAME="$(whoami)-rzv2l_vlp_v3.0.0${BRANCH}"
+if [ ! -z ${VERBOSE} ]; then
+  IGNORE_OUTPUT="2>&1 1>/dev/null"
+fi
+#Create OUTDIR if it doesn't exist
 if [ ! -d "${OUTDIR}" ];
 then
 	mkdir ${OUTDIR}
 fi
-	chmod 777 ${OUTDIR}
+chmod +w ${OUTDIR} ${IGNORE_OUTPUT}
+ret=$?
+if [ $ret -ne 0 ];
+then
+	echo "Unable to obtain full acess  permissions to ${OUTDIR} and its sub directories, edit the permissions of ${OUTDIR} accordingly! exit"
+	exit -1
+fi
 if [ -z "${CPATH}" ]; 
 then
-	chmod 777 ${CPATH}/downloads
-	chmod 777 ${CPATH}/sstate-cache/${MPU}
   /usr/bin/docker run --privileged ${USE_TTY} --rm -e NO=${NO} -e SDK=${SDK} -e DLOAD=${DLOAD} -v "${PWD}/${OUTDIR}":/home/yocto/rzv_vlp_v3.0.0/out --name ${CONTNAME} ${CONTNAME}
 else
 	#Create CPATH sub directories if they do not exist
-	if [ ! -d "${CPATH}/downloads" ];
-	then
-		mkdir ${CPATH}/downloads
-	fi
-	if [ ! -d "${CPATH}/sstate-cache/${MPU}" ];
+	mkdir -p ${CPATH}/downloads
+	mkdir -p ${CPATH}/sstate-cache/${MPU}
+
+	chmod -R +w ${CPATH} ${IGNORE_OUTPUT}
+	ret=$?
+	if [ $ret -ne 0 ];
 	then
-		mkdir ${CPATH}/sstate-cache/${MPU}
+		echo "Unable to obtain write permissions to ${CPATH} and its sub directories, edit the permissions of ${CPATH} accordingly! exit"
+		exit -1
 	fi
-	chmod 777 ${CPATH}/downloads
-	chmod 777 ${CPATH}/sstate-cache/${MPU}
-	/usr/bin/docker run --privileged ${USE_TTY} --rm -v "${PWD}/${OUTDIR}":/home/yocto/rzv_vlp_v3.0.0/out -v "${CPATH}/downloads":/home/yocto/rzv_vlp_v3.0.0/build/downloads -v "${CPATH}/sstate-cache":/home/yocto/rzv_vlp_v3.0.0/build/sstate-cache -e NO=${NO} -e SDK=${SDK} -e DLOAD=${DLOAD} --name ${CONTNAME} ${CONTNAME}
+	/usr/bin/docker run --privileged ${USE_TTY} --rm -v "${PWD}/${OUTDIR}":/home/yocto/rzv_vlp_v3.0.0/out -v "${CPATH}/downloads":/home/yocto/rzv_vlp_v3.0.0/build/downloads -v "${CPATH}/sstate-cache/${MPU}/":/home/yocto/rzv_vlp_v3.0.0/build/sstate-cache -e NO=${NO} -e SDK=${SDK} -e DLOAD=${DLOAD} --name ${CONTNAME} ${CONTNAME}
 fi

Build/meta-mistylwb5p

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 #Check hostname is a hexadecimal number of 12 
+SOMHOSTNAME="MistySOM-V2L"
 LOCALCONF="${WORK}/build/conf/local.conf"
 hname=`hostname | egrep -o '^[0-9a-f]{12}\b'`
 echo $hname
@@ -39,18 +40,46 @@ NUM_CPU=$(((mem+swp)/1000/1000/4))
 #NUM_CPU=`nproc`
 ##Update number of CPUs in local.conf
 sed -i "1 i\PARALLEL_MAKE = \"-j ${NUM_CPU}\"\nBB_NUMBER_THREADS = \"${NUM_CPU}\"" ${LOCALCONF}
+# Comment out the line that flags GPLv3 as an incompatible license
+sed -i '/^INCOMPATIBLE_LICENSE = \"GPLv3 GPLv3+\"/ s/./#&/' ${LOCALCONF}
+# append hostname to local.conf
+echo "hostname_pn-base-files = \"${SOMHOSTNAME}\"" >> ${LOCALCONF}
 #build offline tools, without network access
 if [ -z $DLOAD ];
 then
 	sed -i 's/BB_NO_NETWORK = "0"/BB_NO_NETWORK = "1"/g' ${LOCALCONF}
 fi
-#addition of meta-mistysom layer to bblayers.conf
-sed -i 's/renesas \\/&\n  ${TOPDIR}\/..\/meta-mistysom \\/' ${WORK}/build/conf/bblayers.conf
-#
+
+#Add configuration details for Laird LWB5+ module according to: https://github.com/LairdCP/meta-summit-radio/tree/lrd-10.0.0.x/meta-summit-radio-pre-3.4
+cat <<EOT >> ${LOCALCONF}
+PREFERRED_RPROVIDER_wpa-supplicant = "sterling-supplicant-lwb"
+PREFERRED_RPROVIDER_wpa-supplicant-cli = "sterling-supplicant-lwb"
+PREFERRED_RPROVIDER_wpa-supplicant-passphrase = "sterling-supplicant-lwb"
+PREFERRED_RPROVIDER_wireless-regdb-static = "wireless-regdb"
+EOT
+
+#addition of meta-mistysom & mistylwb5p layers to bblayers.conf
+sed -i 's/renesas \\/&\n'\
+'  ${TOPDIR}\/..\/meta-mistysom \\\n'\
+'  ${TOPDIR}\/..\/meta-econsys \\\n'\
+'  ${TOPDIR}\/..\/meta-mistylwb5p\/meta-summit-radio-pre-3.4 \\\n'\
+'  ${TOPDIR}\/..\/meta-openembedded\/meta-networking \\'\
+'/' ${WORK}/build/conf/bblayers.conf
+
+# Disable recipes, tried BBMASK but was not working
+rm -rf ${WORK}/meta-mistylwb5p/meta-summit-radio-pre-3.4/recipes-packages/openssl
+rm -rf ${WORK}/meta-mistylwb5p/meta-summit-radio-pre-3.4/recipes-packages/summit-*
+rm -rf ${WORK}/meta-virtualization
+
+# add dunfell compatibility to layers where they're missing to avoid WARNING
+echo "LAYERSERIES_COMPAT_qt5-layer = \"dunfell\"" >> ${WORK}/meta-qt5/conf/layer.conf
+echo "LAYERSERIES_COMPAT_rz-features = \"dunfell\"" >> ${WORK}/meta-rz-features/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 ~/rzv_vlp_v3.0.0/'
+    'cd ${WORK}'
     'source poky/oe-init-build-env'
     'bitbake mistysom-image'"
 cd ~/rzv_vlp_v3.0.0

Build/meta-mistysom

@@ -1,5 +1,23 @@
 # MistySOM-V2L
 
-This repository contains data that relate to the **MistySOM-V2L** version. 
+This repository contains data that relate to the **MistySOM-V2L** version. It includes the [Build](Build/) container to build a Linux kernel, device tree  & rootfs for MistySOM
 
-- It includes the [Build](Build/) container to build a Linux kernel, device tree  & rootfs for MistySOM
+## Requirements
+
+The build environment requires a Linux operating system with a Docker Engine installed. (Read [here](https://docs.docker.com/desktop/install/linux-install/) for installation)
+
+As the first build can take hours to complete, it is highly recommended that the machine would have a powerful CPU, at least 16 GB of RAM, and at least 100 GB of SSD. *(Note that later builds would be faster using the previous build caches)*
+
+It is important to be sure that the docker engine has enough space to work. By default, the engine uses the path `/var/lib/docker` which will be very limited if the root partition is separated from the home partition. So we recommend that you move the default location to a bigger partition. (Read [here](https://linuxconfig.org/how-to-move-docker-s-default-var-lib-docker-to-another-directory-on-ubuntu-debian-linux) for moving docker)
+
+## How to Run
+
+Run the commands below to start the build:
+
+````
+git clone --recursive https://github.com/MistySOM/rzv2l.git
+cd rzv2l/Build
+./build.sh
+./run.sh
+````
+Details about the container and its parameters are mentioned [here](Build).