submodules: updated netmodule hashes, triggered by Jenkins (userId=downstream)

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>

.gitmodules

@@ -1,19 +1,19 @@
 [submodule "bitbake"]
 	path = bitbake
 	url = git://git.openembedded.org/bitbake.git
-	branch = 1.42
+	branch = 1.46
 [submodule "openembedded-core"]
 	path = openembedded-core
 	url = git://git.openembedded.org/openembedded-core
-	branch = warrior
+	branch = dunfell
 [submodule "meta-openembedded"]
 	path = meta-openembedded
 	url = git://git.openembedded.org/meta-openembedded
-	branch = warrior
+	branch = dunfell
 [submodule "meta-updater"]
 	path = meta-updater
 	url = https://github.com/advancedtelematic/meta-updater.git
-	branch = warrior
+	branch = dunfell
 [submodule "meta-telephony"]
 	path = meta-telephony
 	url = gitea@git.netmodule.intranet:yoctoproject/meta-telephony.git
@@ -21,23 +21,23 @@
 [submodule "meta-netmodule-private"]
 	path = meta-netmodule-private
 	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-private.git
-	branch = warrior
+	branch = develop
 [submodule "meta-netmodule-bsp"]
 	path = meta-netmodule-bsp
 	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-bsp.git
-	branch = warrior
+	branch = develop
 [submodule "meta-netmodule-distro"]
 	path = meta-netmodule-distro
 	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-distro.git
-	branch = warrior
+	branch = develop
 [submodule "meta-netmodule-fct"]
 	path = meta-netmodule-fct
 	url = gitea@git.netmodule.intranet:yoctoproject/meta-netmodule-fct.git
-	branch = warrior
+	branch = develop
 [submodule "meta-freescale"]
 	path = meta-freescale
 	url = git://git.yoctoproject.org/meta-freescale
-	branch = warrior
+	branch = dunfell
 [submodule "sla-mirror"]
 	path = sla-mirror
 	url = gitea@git.netmodule.intranet:yoctoproject/sla-mirror.git
@@ -49,4 +49,8 @@
 [submodule "meta-netmodule-om"]
 	path = meta-netmodule-om
 	url = gitea@git.netmodule.intranet:hancock/meta-openmatics.git
-	branch = warrior
+	branch = develop
+[submodule "meta-netmodule-wlan"]
+	path = meta-netmodule-wlan
+	url = gitea@git.netmodule.intranet:nrsw-oe/meta-netmodule-wlan.git
+	branch = master

Jenkinsfile

@@ -1,155 +0,0 @@
-// declarative pipeline
-pipeline {
-  agent {
-    node {
-      label 'lxbuild4'
-    }
-  }
-
-  parameters {
-    choice(name: 'MACHINE_TYPE', choices: ['am335x-nmhw21','imx8-nmhw23'], description: 'choose target platform')
-    choice(name: 'IMAGE_TYPE', choices: ['bootloader', 'release', 'dev', 'vcu', 'lava', 'sdk'], description: 'choose target platform')
-    booleanParam(name: 'RELEASE_BUILD', defaultValue: false, description: ' use latest tagged release intead of latest versions')
-    booleanParam(name: 'CLEAN_BUILD', defaultValue: false, description: 'clean all temp directories before build starts')
-  }
-
-  environment {
-    PACKAGE_NAME = 'nm-os'
-    SLACK_TOKEN = '54fghFEpv1Rmf6GJ4gJ7cL2y'
-
-    MACHINE = "${MACHINE_TYPE}"
-
-    SHARED_BUILD = "${WORKSPACE}/build"
-    build_deploy = "${SHARED_BUILD}/tmp/deploy/images/${MACHINE}"
-    build_licenses = "${SHARED_BUILD}/tmp/deploy/licenses"
-    buildhistory = "${HOME}/yocto-share/buildhistory"
-  }
-
-  options {
-    timeout(time: 8, unit: 'HOURS')
-    buildDiscarder(logRotator(numToKeepStr: '5'))
-    disableConcurrentBuilds()
-  }
-
-  stages {
-    stage('prepare') {
-      steps {
-        script {
-          if(params.RELEASE_BUILD) {
-            sh 'git submodule update' // set all submodules to freezed commit
-            currentBuild.rawBuild.keepLog(true) // keep this build forever
-          }
-          else {
-            sh 'git submodule update --remote --rebase' // update all submodules to HEAD
-          }
-
-          version = sh returnStdout: true, script: 'git describe --tags --dirty'
-          version = version.trim()
-
-          println "----------------------------------\n Job Parameters:\n----------------------------------\n\
-    MACHINE_TYPE  = ${params.MACHINE_TYPE}\n\
-    IMAGE_TYPE    = ${params.IMAGE_TYPE}\n\
-    RELEASE_BUILD = ${params.RELEASE_BUILD}\n\
-    CLEAN_BUILD   = ${params.CLEAN_BUILD}\n\
-----------------------------------\n"
-
-          env.BUILD_VERSION = "${version}"
-          currentBuild.displayName = "${version}-${MACHINE}-${IMAGE_TYPE}" //replace Bitbake timestamp after building
-        }
-        writeFile file: 'VERSION', text: "${PACKAGE_NAME}: ${BUILD_VERSION}"
-      }
-    }
-
-    stage('clean') {
-      when { expression { return params.CLEAN_BUILD } }
-      steps {
-        lock("${LOCK_NAME}") {
-          dir ("${SHARED_BUILD}/tmp") { deleteDir() }
-          dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
-        }
-      }
-    }
-
-    stage('build') {
-      steps {
-        script {
-          build_and_deploy()
-        }
-      }
-    }
-  } // stages
-}
-
-
-def build_and_deploy() {
-    if (params.IMAGE_TYPE == 'sdk') {
-        sh "bash -c '. ./env.image-ostree && bitbake -k netmodule-linux-image -c populate_sdk'"
-        zip archive: true, dir: "${HOME}/yocto-share/build/tmp/deploy/sdk", glob: '*.sh', zipFile: "${PACKAGE_NAME}-${BUILD_VERSION}-${MACHINE}-sdk.zip"
-    }
-    else if (params.IMAGE_TYPE == 'bootloader') {
-        sh "bash -c '. ./env.common && bitbake virtual/bootloader'"
-    }
-    else if (params.IMAGE_TYPE == 'vcu') {
-        build('vcu', 'vcu', false)
-        deploy('vcu', false)
-    }
-    else if (params.IMAGE_TYPE == 'lava' || params.IMAGE_TYPE == 'fct' || params.IMAGE_TYPE == 'minimal') {
-        build(params.IMAGE_TYPE, params.IMAGE_TYPE, true)
-        deploy(params.IMAGE_TYPE, true)
-    }
-    else if (params.IMAGE_TYPE == 'release') {
-        build('ostree', '', false)
-        deploy('', false)
-    }
-    else {
-        build('ostree', params.IMAGE_TYPE, false)
-        deploy(params.IMAGE_TYPE, false)
-    }
-}
-
-def build(env_in, image_type_in, single_fitImage) {
-  def env = "${env_in}" == "" ? "" : "-${env_in}"
-  def image_type = "${image_type_in}" == "" ? "" : "-${image_type_in}"
-  if (single_fitImage) {
-    sh "bash -c '. ./env.image${env} && bitbake -k virtual/kernel'"
-  } else {
-    sh "bash -c '. ./env.image${env} && bitbake -k netmodule-linux-image${image_type}'"
-  }
-}
-
-def deploy(image_type_in, single_fitImage) {
-  def image_type = "${image_type_in}" == "" ? "" : "-${image_type_in}"
-  dir ("tmp/build${image_type}") {
-    def image_basename = "netmodule-linux-image${image_type}-${MACHINE}"
-    def basename_in = "${build_deploy}/${image_basename}"
-    def basename_out = "./image${image_type}-${MACHINE}"
-
-    sh "cp ${basename_in}.manifest ${basename_out}.manifest"
-    sh "bash -c '${WORKSPACE}/openembedded-core/scripts/buildhistory-collect-srcrevs -p ${buildhistory} > srcrev-${MACHINE}${image_type}.inc'"
-
-    sh label: 'Copy License Manifest', returnStatus: true, script: """
-        LATEST_LICENSE_DIR=\$(ls -Artd ${build_licenses}/netmodule-linux-image${image_type}* | tail -n 1)
-        cp \$LATEST_LICENSE_DIR/license.manifest ${basename_out}_license.manifest"""
-
-    if (single_fitImage == false) {
-        sh label: 'Copy initramfs License Manifest', returnStatus: true, script: """
-            LATEST_LICENSE_DIR=\$(ls -Artd ${build_licenses}/initramfs-ostree-image-${MACHINE}-* | tail -n 1)
-            cp \$LATEST_LICENSE_DIR/license.manifest initramfs-ostree-image_license.manifest
-            """
-    }
-
-    if(single_fitImage){
-      sh "cp ${build_deploy}/fitImage-${image_basename}-${MACHINE} fitImage-${image_basename}"
-      sh "cp ${basename_in}.tar.gz ${basename_out}.tar.gz"
-    }
-    else {
-      sh "cp ${build_deploy}/fitImage-${MACHINE}.bin ."
-      sh "cp ${basename_in}.ota-ext4 ${basename_out}.ota-ext4"
-      sh "cp ${basename_in}.wic ${basename_out}.wic"
-      def ostree_archive = "ostree_repo${image_type}.tar.gz"
-      sh "tar czf ./${ostree_archive} -C ${build_deploy}/ostree_repo  ."
-    }
-  }
-}
-
-

autorev-packages.inc

@@ -0,0 +1,54 @@
+#./meta-netmodule-bsp/recipes-kernel/ssc-sysstate-driver/ssc-sysstate-driver_git.bb
+SRCREV_ssc-sysstate-driver = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-kernel/ssc-broker-driver/ssc-broker-driver_git.bb
+SRCREV_ssc-broker-driver = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-kernel/ssc-extmod-driver/ssc-extmod-driver_git.bb
+SRCREV_ssc-extmod-driver = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-kernel/dt-overlay/dt-overlay_1.0.bb
+SRCREV_dt-overlay = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-kernel/linux/linux-netmodule_git.bb
+SRCREV_linux-netmodule = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-connectivity/nmubxlib/nmubxlib.bb
+SRCREV_nmubxlib = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-connectivity/gnss-mgr/gnss-mgr.bb
+SRCREV_gnss-mgr = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-connectivity/wwan-config/wwan-config.bb
+SRCREV_wwan-config = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-connectivity/modemmanager/modemmanager_git.bb
+SRCREV_modemmanager = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-bsp/bootloader-config/bootloader-config.bb
+SRCREV_bootloader-config = "${AUTOREV}"
+#./meta-netmodule-bsp/freescale/recipes-imx/imx-atf/imx-atf_1.5.0.bb
+SRCREV_imx-atf = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-imx8-nmhw23_git.bb
+SRCREV_u-boot-imx8-nmhw23 = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-armada_git.bb
+SRCREV_u-boot-armada = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-bsp/u-boot/u-boot-ti33x_git.bb
+SRCREV_u-boot-ti33x = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-core/udev/udev-rules-nmhw_git.bb
+SRCREV_udev-rules-nmhw = "${AUTOREV}"
+#./meta-netmodule-distro/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb
+SRCREV_nmhw-fwupdate = "${AUTOREV}"
+#./meta-netmodule-distro/recipes-tools/libnmapp/libnmapp_git.bb
+SRCREV_libnmapp = "${AUTOREV}"
+#./meta-netmodule-distro/recipes-tools/ssf-mgr/ssf-mgr_git.bb
+SRCREV_ssf-mgr = "${AUTOREV}"
+#./meta-netmodule-distro/recipes-tools/sys-mon/sys-mon_git.bb
+SRCREV_sys-mon = "${AUTOREV}"
+#./meta-netmodule-bsp/recipes-bsp/storage-info/storage-info.bb
+SRCREV_storage-info = "${AUTOREV}"
+#./meta-netmodule-distro/recipes-tools/battery-test/battery-test_git.bb
+SRCREV_battery-test = "${AUTOREV}"
+#./meta-netmodule-fct/recipes-testing/fct/fct.bb
+SRCREV_fct = "${AUTOREV}"
+#./meta-netmodule-fct/recipes-testing/provisioning/provisioning.bb
+SRCREV_provisioning = "${AUTOREV}"
+#./meta-netmodule-fct/recipes-testing/badassbd/badassbd.bb
+SRCREV_badassbd = "${AUTOREV}"
+#./meta-netmodule-fct/recipes-connectivity/toast/toast.bb
+SRCREV_toast = "${AUTOREV}"
+#./meta-netmodule-om/recipes-navigation/gpsd/gpsd_om-3.20.bb
+SRCREV_gpsd_om = "${AUTOREV}"
+#./meta-netmodule-private/recipes-extended/hydra/hydra_1.0.0.bb
+SRCREV_hydra = "${AUTOREV}"

bitbake

@@ -1 +1 @@
-Subproject commit 417f635fca1aa2484c7ccba9ffbbfe9601d41d66
+Subproject commit 0784db7dd0fef6f0621ad8d74372f44e87fef950

build-fct/conf/bblayers.conf

@@ -0,0 +1,25 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "7"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+BBLAYERS ?= " \
+  ${YOCTOROOT}/openembedded-core/meta \
+  ${YOCTOROOT}/meta-netmodule-wlan \
+  ${YOCTOROOT}/meta-netmodule-bsp \
+  ${YOCTOROOT}/meta-netmodule-distro \
+  ${YOCTOROOT}/meta-netmodule-private \
+  ${YOCTOROOT}/meta-openembedded/meta-python \
+  ${YOCTOROOT}/meta-openembedded/meta-oe \
+  ${YOCTOROOT}/meta-openembedded/meta-networking \
+  ${YOCTOROOT}/meta-openembedded/meta-filesystems \
+  ${YOCTOROOT}/meta-updater \
+  ${YOCTOROOT}/meta-freescale \
+  ${YOCTOROOT}/meta-ublox-module \
+  ${YOCTOROOT}/meta-netmodule-om \
+  ${YOCTOROOT}/meta-netmodule-fct \
+  "

build-fct/conf/local.conf

@@ -0,0 +1,48 @@
+BB_NUMBER_THREADS ?= "8"
+PARALLEL_MAKE ?= "-j 8"
+PACKAGE_CLASSES ?= "package_rpm"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K"
+ASSUME_PROVIDED += "libsdl-native"
+CONF_VERSION = "1"
+EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
+
+ERROR_QA_remove += "version-going-backwards"
+#WARN_QA_append += "version-going-backwards"
+#https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
+
+#PRSERV_HOST = "localhost:0"
+
+SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
+DL_DIR="${YOCTOROOT}/build-common/downloads"
+
+BUILDHISTORY_COMMIT = "1"
+BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <alexandre.bard@netmodule.com>"
+
+# Add licences file to the rootfs
+COPY_LIC_MANIFEST = "1"
+COPY_LIC_DIRS = "1"
+LICENSE_CREATE_PACKAGE = "1"
+
+INHERIT += "buildhistory buildstats-summary"
+
+# enable upstream check to use head of branch:
+UPSTREAM_CHECK_COMMITS = "1"
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+PREMIRRORS_prepend = "\
+   git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
+
+include ../../autorev-packages.inc
+include distro_version.inc

build-fct/conf/templateconf.cfg

@@ -0,0 +1 @@
+../meta-netmodule-fct/conf

build-minimal/conf/bblayers.conf

@@ -0,0 +1,24 @@
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "7"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+BBLAYERS ?= " \
+  ${YOCTOROOT}/openembedded-core/meta \
+  ${YOCTOROOT}/meta-netmodule-wlan \
+  ${YOCTOROOT}/meta-netmodule-bsp \
+  ${YOCTOROOT}/meta-netmodule-distro \
+  ${YOCTOROOT}/meta-netmodule-private \
+  ${YOCTOROOT}/meta-openembedded/meta-python \
+  ${YOCTOROOT}/meta-openembedded/meta-oe \
+  ${YOCTOROOT}/meta-openembedded/meta-networking \
+  ${YOCTOROOT}/meta-openembedded/meta-filesystems \
+  ${YOCTOROOT}/meta-updater \
+  ${YOCTOROOT}/meta-freescale \
+  ${YOCTOROOT}/meta-ublox-module \
+  ${YOCTOROOT}/meta-netmodule-om \
+  "

build-minimal/conf/local.conf

@@ -0,0 +1,48 @@
+BB_NUMBER_THREADS ?= "8"
+PARALLEL_MAKE ?= "-j 8"
+PACKAGE_CLASSES ?= "package_rpm"
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+PATCHRESOLVE = "noop"
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K"
+ASSUME_PROVIDED += "libsdl-native"
+CONF_VERSION = "1"
+EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
+
+ERROR_QA_remove += "version-going-backwards"
+#WARN_QA_append += "version-going-backwards"
+#https://www.yoctoproject.org/docs/2.5.2/ref-manual/ref-manual.html#ref-classes-insane
+
+#PRSERV_HOST = "localhost:0"
+
+SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
+DL_DIR="${YOCTOROOT}/build-common/downloads"
+
+BUILDHISTORY_COMMIT = "1"
+BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <alexandre.bard@netmodule.com>"
+
+# Add licences file to the rootfs
+COPY_LIC_MANIFEST = "1"
+COPY_LIC_DIRS = "1"
+LICENSE_CREATE_PACKAGE = "1"
+
+INHERIT += "buildhistory buildstats-summary"
+
+# enable upstream check to use head of branch:
+UPSTREAM_CHECK_COMMITS = "1"
+
+YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
+
+PREMIRRORS_prepend = "\
+   git://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
+   https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
+
+include ../../autorev-packages.inc
+include distro_version.inc

build-minimal/conf/templateconf.cfg

@@ -0,0 +1 @@
+meta/conf

build/conf/bblayers.conf

@@ -9,6 +9,7 @@ YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
 
 BBLAYERS ?= " \
   ${YOCTOROOT}/openembedded-core/meta \
+  ${YOCTOROOT}/meta-netmodule-wlan \
   ${YOCTOROOT}/meta-netmodule-bsp \
   ${YOCTOROOT}/meta-netmodule-distro \
   ${YOCTOROOT}/meta-netmodule-private \
@@ -19,10 +20,5 @@ BBLAYERS ?= " \
   ${YOCTOROOT}/meta-updater \
   ${YOCTOROOT}/meta-freescale \
   ${YOCTOROOT}/meta-ublox-module \
-  "
-
-# Distro related layers
-BBLAYERS += " \
-  ${@bb.utils.contains_any('DISTRO_TYPE', '-fct -lava', '${YOCTOROOT}/meta-netmodule-fct', '', d)} \
-  ${@bb.utils.contains_any('DISTRO_TYPE', '-vcu', '${YOCTOROOT}/meta-netmodule-om', '', d)} \
+  ${YOCTOROOT}/meta-netmodule-om \
   "

build/conf/local.conf

@@ -1,5 +1,5 @@
-BB_NUMBER_THREADS ?= "4"
-PARALLEL_MAKE ?= "-j 4"
+BB_NUMBER_THREADS ?= "8"
+PARALLEL_MAKE ?= "-j 8"
 PACKAGE_CLASSES ?= "package_rpm"
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 PATCHRESOLVE = "noop"
@@ -7,11 +7,9 @@ BB_DISKMON_DIRS = "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
-    STOPTASKS,/tmp,100M,100K \
     ABORT,${TMPDIR},100M,1K \
     ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K \
-    ABORT,/tmp,10M,1K"
+    ABORT,${SSTATE_DIR},100M,1K"
 ASSUME_PROVIDED += "libsdl-native"
 CONF_VERSION = "1"
 EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
@@ -22,11 +20,11 @@ ERROR_QA_remove += "version-going-backwards"
 
 #PRSERV_HOST = "localhost:0"
 
-BUILDHISTORY_COMMIT = "1"
-BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <ramon.moesching@netmodule.com>"
+SSTATE_DIR="${YOCTOROOT}/build-common/sstate-cache"
+DL_DIR="${YOCTOROOT}/build-common/downloads"
 
-# Mirror GIT repo in download folders
-BB_GENERATE_MIRROR_TARBALLS = "1"
+BUILDHISTORY_COMMIT = "1"
+BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <alexandre.bard@netmodule.com>"
 
 # Add licences file to the rootfs
 COPY_LIC_MANIFEST = "1"
@@ -35,6 +33,9 @@ LICENSE_CREATE_PACKAGE = "1"
 
 INHERIT += "buildhistory buildstats-summary"
 
+# enable upstream check to use head of branch:
+UPSTREAM_CHECK_COMMITS = "1"
+
 YOCTOROOT = "${@os.path.abspath(os.path.join("${TOPDIR}", os.pardir))}"
 
 PREMIRRORS_prepend = "\
@@ -42,3 +43,7 @@ PREMIRRORS_prepend = "\
    ftp://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
    http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
    https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"
+
+include ../../autorev-packages.inc
+include distro_version.inc
+

build/conf/templateconf.cfg

@@ -0,0 +1 @@
+../meta-netmodule-distro/conf

env.common

@@ -1,20 +0,0 @@
-set -a # exports all variables
-
-# exporting DISTRO*
-DISTRO_OSTREE=$DISTRO_OSTREE
-DISTRO_TYPE=$DISTRO_TYPE
-DISTRO=netmodule-linux$DISTRO_OSTREE$DISTRO_TYPE
-
-if [ -z "$MACHINE" ]; then
-    . ./machine_select
-fi
-
-MACHINE_TYPE=$(echo $MACHINE | rev | cut -f2- -d- | rev)
-
-echo Building for machine $MACHINE, distro: $DISTRO
-
-OSTREE_OSNAME=nm-linux
-
-BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE_TYPE DISTRO_OSTREE DISTRO_TYPE"
-
-. ./openembedded-core/oe-init-build-env

env.image

@@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE=""
-
-. ./env.common

env.image-fct

@@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-fct"
-
-. ./env.common

env.image-lava

@@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-lava"
-
-. ./env.common

env.image-minimal

@@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-minimal"
-
-. ./env.common

env.image-ostree

@@ -1,4 +0,0 @@
-DISTRO_OSTREE="-ostree"
-DISTRO_TYPE=""
-
-. ./env.common

env.image-vcu

@@ -1,5 +0,0 @@
-
-DISTRO_OSTREE="-ostree"
-DISTRO_TYPE="-vcu"
-
-. ./env.common

env/common

@@ -0,0 +1,24 @@
+if [ -z "$DISTRO" ]; then
+    echo "No distro selected. Please source a helper script (env/distro/*)"
+    return
+fi
+
+if [ -z "$MACHINE" ]; then
+    echo "No machine selected. Please source a helper script (env/machine/*)"
+    return
+fi
+
+echo
+echo Build parameters:
+printf "\tMACHINE = $MACHINE\n"
+printf "\tDISTRO = $DISTRO\n"
+echo
+
+export DISTRO
+export MACHINE
+export OSTREE_OSNAME=nm-linux
+
+# Moving back to top yocto directory (env/..)
+env_path=${BASH_SOURCE:-$0}
+cd $(dirname $env_path)/..
+source openembedded-core/oe-init-build-env build$BUILD_FOLDER_APPEND

env/distro/base-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/fct-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-fct"
+BUILD_FOLDER_APPEND="-fct"
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/lava-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-lava"
+BUILD_FOLDER_APPEND="-fct"
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/minimal-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-minimal"
+BUILD_FOLDER_APPEND="-minimal"
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/ostree-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-ostree"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/distro/vcu-image

@@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-ostree-vcu"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/interactive-machine-selector

@@ -4,21 +4,27 @@
 
 PS3='Please choose a machine: '
 HW16="nrhw16 - NB800"
+HW17="hw17 - NB2800"
 HW18="nrhw18 - NB1800"
 HW20="nrhw20 - NB1601"
 HW21="nmhw21 - VCU1"
 HW23="nmhw23 - VCU2"
+DLM="nmhw23-dlm - VCU2-DLM variant"
 HW24="nrhw24 - NB800 facelift"
+HW25="hw25 - TC Router"
 HW26="hw26 - NG800"
 
-set -a
-select opt in HW16 HW18 HW20 HW21 HW23 HW24 HW26
+select opt in HW16 HW17 HW18 HW20 HW21 HW23 DLM HW24 HW25 HW26
 do
     case $opt in
         HW16)
             MACHINE=am335x-nrhw16
             break
             ;;
+        HW17)
+            MACHINE=armada-385-hw17
+            break
+            ;;
         HW18)
             MACHINE=armada-385-nrhw18
             break
@@ -35,10 +41,18 @@ do
             MACHINE=imx8-nmhw23
             break
             ;;
+        DLM)
+            MACHINE=imx8-nmhw23-dlm
+            break
+            ;;
         HW24)
             MACHINE=am335x-nmhw24
             break
             ;;
+        HW25)
+            MACHINE=am335x-hw25
+            break
+            ;;
         HW26)
             MACHINE=am335x-hw26
             break
@@ -48,3 +62,4 @@ do
 done
 
 echo $MACHINE
+export MACHINE

env/machine/hw16

@@ -0,0 +1,3 @@
+MACHINE=am335x-nrhw16
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw17

@@ -0,0 +1,3 @@
+MACHINE=armada-385-hw17
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw18

@@ -0,0 +1,3 @@
+MACHINE=armada-385-nrhw18
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw20

@@ -0,0 +1,3 @@
+MACHINE=am335x-nrhw20
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw21

@@ -0,0 +1,3 @@
+MACHINE=am335x-nmhw21
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw23

@@ -0,0 +1,3 @@
+MACHINE=imx8-nmhw23
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw24

@@ -0,0 +1,3 @@
+MACHINE=am335x-nmhw24
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw25

@@ -0,0 +1,3 @@
+MACHINE=am335x-hw25
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

env/machine/hw26

@@ -0,0 +1,3 @@
+MACHINE=am335x-hw26
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common

meta-freescale

@@ -1 +1 @@
-Subproject commit dde79e0e441cf0dae95ba42acdb9d81a384541c4
+Subproject commit 3dbca0ef2ae1ea3862e540c59ad77adbcb419d57

meta-netmodule-bsp

@@ -1 +1 @@
-Subproject commit 9051b7c4ea164b5bedca4735359f5ff212802fd6
+Subproject commit 901c12f911e4fa4ae351ca6da07e4b4dacd1d6f1

meta-netmodule-distro

@@ -1 +1 @@
-Subproject commit 5d4c0fa6b1c61edfe312751a5e4f18fda3ad560c
+Subproject commit 30d95eb8c877bb655cfd11a5dd1f7ba0a533e2b7

meta-netmodule-fct

@@ -1 +1 @@
-Subproject commit d4fd74fcbef031471264a7df315da6f5e1debe28
+Subproject commit 7538f89cfdd7624df5c2a7ba9d3ceb01d8536671

meta-netmodule-om

@@ -1 +1 @@
-Subproject commit 289fccad4e69068cbc9e0991a5a43e856d7ed9ef
+Subproject commit 8bd0b8ee7ade4aaec66d0a1dfe4d6aa65e8dd661

meta-netmodule-private

@@ -1 +1 @@
-Subproject commit 17e4deaa531cc1b63e37fea24f95898f1acf4c49
+Subproject commit 8a842de32d43fd61c3e99f16d01a81918ed3c5d0

meta-netmodule-wlan

@@ -0,0 +1 @@
+Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696

meta-openembedded

@@ -1 +1 @@
-Subproject commit a24acf94d48d635eca668ea34598c6e5c857e3f8
+Subproject commit 8ff12bfffcf0840d5518788a53d88d708ad3aae0

meta-ublox-module

@@ -1 +1 @@
-Subproject commit 0ce7008f40a013ad23a3daa92fb547211dbd3e84
+Subproject commit 79b59bd378b8d43d86e4c14147a54e8cc7509e4f

meta-updater

@@ -1 +1 @@
-Subproject commit 28a16ab89ca251748faef601e05764424b9defb3
+Subproject commit f2f5ca077baa1f08001cff9608ae59ed4dbeca3d

openembedded-core

@@ -1 +1 @@
-Subproject commit db3ce703d03b18e8a4120969d32ff7f344f34fe9
+Subproject commit 8e81d38048c953d0823abf04d5b2506cd988f0bb