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

submodules: updated netmodule hashes, triggered by Marc Mattmüller (userId=mattmueller)
autorev-packages: remove wlconf-bin from AUTOREV list
2022-06-09 12:36:30 +02:00 · 2022-05-31 12:22:52 +02:00 · 2022-05-24 16:18:48 +02:00 · 2022-05-24 16:17:50 +02:00 · 2022-05-23 15:05:40 +02:00 · 2022-05-05 15:54:46 +02:00
45 changed files with 306 additions and 337 deletions
--- a/275
+++ b/275
@ -1,275 +0,0 @@
-// declarative pipeline
-pipeline {
-  agent {
-    node {
-      label 'lxbuild4'
-    }
-  }
-
-  parameters {
-    choice(name: 'MACHINE_TYPE', choices: ['select...', 'am335x-nrhw20', 'am335x-nmhw21', 'imx8-nmhw23', 'am335x-nmhw24', 'am335x-hw25', 'am335x-hw26'], description: 'choose target platform')
-    choice(name: 'IMAGE_TYPE', choices: ['bootloader', 'release', 'dev', 'vcu', 'lava', 'fct', 'minimal', 'sdk'], description: 'choose target platform')
-    string(name: 'RLS_VERSION', defaultValue: '', description: 'Set the version to build and use committed submodules')
-    booleanParam(name: 'COLLECT_REV', defaultValue: false, description: 'collect the used revisions')
-    booleanParam(name: 'CLEAN_BUILD', defaultValue: false, description: 'clean all temp directories before build starts')
-  }
-
-  environment {
-    PACKAGE_NAME = 'nm-os'
-
-    MACHINE = "${MACHINE_TYPE}"
-
-    SHARED_BUILD = "${WORKSPACE}/build"
-    build_deploy = "${SHARED_BUILD}/tmp/deploy/images/${MACHINE}"
-    build_licenses = "${SHARED_BUILD}/tmp/deploy/licenses"
-    buildhistory = "${SHARED_BUILD}/buildhistory"
-
-    DISTO_VERSION_FILE = "${SHARED_BUILD}/conf/distro_version.inc"
-    SUBMODULE_VERION_FILE = "submodule_revisions"
-    AUTOREV_VERSION_FILE = "autorev_revisions.inc"
-  }
-
-  options {
-    timeout(time: 8, unit: 'HOURS')
-    buildDiscarder(
-      logRotator(numToKeepStr: '50',
-                 daysToKeepStr: '1',
-                 artifactNumToKeepStr: '50',
-                 artifactDaysToKeepStr: '1'
-      )
-    )
-    disableConcurrentBuilds()
-  }
-
-  stages {
-    stage('prepare') {
-      steps {
-        script {
-          if("${params.MACHINE_TYPE}" == "select...") {
-            error("Missing machine type --> select parameter MACHINE_TYPE for a proper build")
-          }
-          handle_submodules("${params.RLS_VERSION}")
-          version = build_version("${params.RLS_VERSION}")
-
-          println "----------------------------------\n Job Parameters:\n----------------------------------\n\
-    MACHINE_TYPE  = ${params.MACHINE_TYPE}\n\
-    IMAGE_TYPE    = ${params.IMAGE_TYPE}\n\
-    CLEAN_BUILD   = ${params.CLEAN_BUILD}\n\
-    COLLECT_REV   = ${params.COLLECT_REV}\n\
-    RLS_VERSION   = ${params.RLS_VERSION}\n\
-      --> version = ${version}\n\
----------------------------------\n"
-          env.BUILD_VERSION = "${version}"
-          currentBuild.displayName = "${version}-${MACHINE}-${IMAGE_TYPE}" //replace Bitbake timestamp after building
-
-          change_distro_version("${version}")
-        }
-        writeFile file: 'VERSION', text: "${PACKAGE_NAME}: ${BUILD_VERSION}"
-      }
-    }
-
-    stage('clean') {
-      when { expression { return params.CLEAN_BUILD } }
-      steps {
-        dir ("${SHARED_BUILD}/tmp") { deleteDir() }
-        dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
-      }
-    }
-
-    stage('collect versions') {
-      when { expression { return params.COLLECT_REV } }
-      steps {
-        script {
-          revisions = getAutoRevHashes()
-          writeFile(file: "${env.AUTOREV_VERSION_FILE}", text: "${revisions}")
-        }
-      }
-      post {
-        success {
-          archiveArtifacts(artifacts: "${env.SUBMODULE_VERION_FILE}, ${env.AUTOREV_VERSION_FILE}, ${env.DISTO_VERSION_FILE}", onlyIfSuccessful: false)
-        }
-      }
-    }
-
-    stage('build') {
-      steps {
-        script {
-          build_and_archive()
-        }
-        dir ('tmp/artifacts') {
-          zip archive: true, dir: "${WORKSPACE}/tmp/build-output", glob: "*", zipFile: "${PACKAGE_NAME}-${BUILD_VERSION}-${machine}-${IMAGE_TYPE}.zip"
-        }
-        sh "rm -rf ${WORKSPACE}/tmp"
-      }
-    }
-  } // stages
-}
-
-
-def isRelease(versionParam) {
-  if((versionParam == "") || (versionParam == "latest")) {
-    return false
-  }
-  return true
-}
-
-def handle_submodules(versionParam) {
-  sh 'git submodule init'
-  if(isRelease(versionParam)) {
-    sh 'git submodule update' // set all submodules to freezed commit
-  }
-  else {
-    sh 'git submodule update --remote --rebase' // update all submodules to HEAD
-  }
-  submoduleStatus = sh(returnStdout: true, script: "git submodule status").trim()  // print submodule hashes to jenkins log
-  println "${submoduleStatus}"
-  writeFile(file: "${env.SUBMODULE_VERION_FILE}", text: "${submoduleStatus}")
-}
-
-def build_version(versionParam) {
-  sh 'git fetch -p'
-  sh 'git fetch -t'
-  def gitCmd = "git describe --tags"
-  if(!isRelease(versionParam)) {
-    gitCmd = "${gitCmd} --dirty"
-  }
-  gitversion = sh(returnStdout: true, script: "${gitCmd}").trim()
-  String[] versionArr = "${gitversion}".split("-")
-  if(isRelease(versionParam)) {
-    String newVersionStr = versionParam 
-    versionArr[0] = newVersionStr
-  }
-  else {
-    if(params.IMAGE_TYPE != 'fct') {
-      def buildnbr = getTopUpstreamBuildNumber()
-      String nightlyPart = versionArr[0] + ".Test${buildnbr}"
-      versionArr[0] = nightlyPart
-    }
-  }
-  rlsVersion = versionArr.join("-")
-  return rlsVersion
-}
-
-def change_distro_version(versionString){
-  println "Set the distro version to ${versionString}..."
-  def versionTag = "DISTRO_VERSION = \"${versionString}\""
-  writeFile(file: "${env.DISTO_VERSION_FILE}", text: "${versionTag}")
-}
-
-def cleanup_distro_version() {
-  println "cleaning repository regarding distro version..."
-  sh(script:"git clean -f ${env.DISTO_VERSION_FILE}")
-}
-
-
-def build_and_archive() {
-    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'"
-        dir ('tmp/build-output') {
-            sh 'cp ${build_deploy}/*u-boot-${MACHINE_TYPE}.img . || true'
-            sh 'cp ${build_deploy}/*u-boot-${MACHINE_TYPE}.xmodem.bin . || true'
-            sh 'cp ${build_deploy}/imx-boot . || true'
-            sh 'cp ${build_deploy}/imx-boot.sd . || true'
-        }
-    }
-    else if (params.IMAGE_TYPE == 'vcu') {
-        build('vcu', 'vcu', false)
-        archive('vcu', false)
-    }
-    else if (params.IMAGE_TYPE == 'lava' || params.IMAGE_TYPE == 'fct' || params.IMAGE_TYPE == 'minimal') {
-        build(params.IMAGE_TYPE, params.IMAGE_TYPE, true)
-        archive(params.IMAGE_TYPE, true)
-    }
-    else if (params.IMAGE_TYPE == 'release') {
-        build('ostree', '', false)
-        archive('', false)
-    }
-    else {
-        build('ostree', params.IMAGE_TYPE, false)
-        archive(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/netmodule-image'"
-  } else {
-    /* The following workaround can be removed once the explanation for the missing lic has been found */
-    if (! fileExists("build/tmp/deploy/licenses/gpsd"))
-      sh "bash -c '. ./env.image${env} && bitbake -fc populate_lic gpsd'"
-    if (! fileExists("build/tmp/deploy/licenses/ostree-kernel-initramfs"))
-      sh "bash -c '. ./env.image${env} && bitbake -fc populate_lic ostree-kernel-initramfs'"
-    sh "bash -c '. ./env.image${env} && bitbake -k netmodule-linux-image${image_type}'"
-  }
-}
-
-def archive(image_type_in, single_fitImage) {
-  def image_type = "${image_type_in}" == "" ? "" : "-${image_type_in}"
-  dir ("tmp/build-output") {
-    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){
-      if(image_type_in == "minimal")
-        sh "cp ${build_deploy}/initramfs-linux/fitImage-${image_basename}-${MACHINE} fitImage-${image_basename}"
-      else
-        sh "cp ${build_deploy}/fct-linux/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  ."
-      archiveArtifacts artifacts: "${ostree_archive}", onlyIfSuccessful: true
-      sh "rm -f ./${ostree_archive}"
-    }
-  }
-}
-
-def getTopUpstreamBuildNumber() {
-  // Iterating though all upstream jobs:
-  //   currentBuild.upstreamBuilds.each { item ->
-  //     echo "upstream build: ${item}"
-  //     def nbr = item.getNumber()
-  //     echo "nbr=${nbr}"
-  //   }
-  def upstreamJobList = currentBuild.upstreamBuilds
-  def nbrOfUpstreamJobs = upstreamJobList.size()
-  if (nbrOfUpstreamJobs == 0)
-    return 0;
-  def topJob = upstreamJobList[nbrOfUpstreamJobs-1]
-  println "Top upstream project: " + topJob.getFullDisplayName()
-  def topJobNbr = topJob.getNumber()
-  println "Top upstream job build Number = ${topJobNbr}"
-  return topJobNbr
-}
-
-def getAutoRevHashes() {
-  sh(script: "bash -c '. ./env.image-ostree && bitbake netmodule-linux-image-dev --runall=fetch'")
-  def revs = sh(returnStdout: true, script: "bash -c \". ./env.image-ostree > /dev/null && buildhistory-collect-srcrevs\"").trim()
-  return revs
-}
--- a/autorev-packages.inc
+++ b/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}"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit da306cd4430a6fcf6b62ed0e6e5310432aa4c4c4
+Subproject commit 0784db7dd0fef6f0621ad8d74372f44e87fef950
--- a/build-fct/conf/bblayers.conf
+++ b/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 \
+  "
--- a/build-fct/conf/local.conf
+++ b/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
--- a/build-fct/conf/templateconf.cfg
+++ b/build-fct/conf/templateconf.cfg
@ -0,0 +1 @@
+../meta-netmodule-fct/conf
--- a/build-minimal/conf/bblayers.conf
+++ b/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 \
+  "
--- a/build-minimal/conf/local.conf
+++ b/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
--- a/build-minimal/conf/templateconf.cfg
+++ b/build-minimal/conf/templateconf.cfg
@ -0,0 +1 @@
+meta/conf
--- a/build/conf/bblayers.conf
+++ b/build/conf/bblayers.conf
@ -21,5 +21,4 @@ BBLAYERS ?= " \
  ${YOCTOROOT}/meta-freescale \
  ${YOCTOROOT}/meta-ublox-module \
  ${YOCTOROOT}/meta-netmodule-om \
-  ${YOCTOROOT}/meta-netmodule-fct \
  "
--- a/build/conf/local.conf
+++ b/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,8 +20,11 @@ ERROR_QA_remove += "version-going-backwards"

 #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 <ramon.moesching@netmodule.com>"
+BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <alexandre.bard@netmodule.com>"

 # Add licences file to the rootfs
 COPY_LIC_MANIFEST = "1"
@ -32,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 = "\
@ -40,4 +44,6 @@ PREMIRRORS_prepend = "\
   http://.*/.* file://${YOCTOROOT}/sla-mirror/ \n \
   https://.*/.* file://${YOCTOROOT}/sla-mirror/ \n"

+include ../../autorev-packages.inc
 include distro_version.inc
+
--- a/build/conf/templateconf.cfg
+++ b/build/conf/templateconf.cfg
@ -0,0 +1 @@
+../meta-netmodule-distro/conf
--- a/env.common
+++ b/env.common
@ -1,18 +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
-
-. ./openembedded-core/oe-init-build-env
--- a/env.image
+++ b/env.image
@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE=""
-
-. ./env.common
--- a/env.image-fct
+++ b/env.image-fct
@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-fct"
-
-. ./env.common
--- a/env.image-lava
+++ b/env.image-lava
@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-lava"
-
-. ./env.common
--- a/env.image-minimal
+++ b/env.image-minimal
@ -1,4 +0,0 @@
-DISTRO_OSTREE=""
-DISTRO_TYPE="-minimal"
-
-. ./env.common
--- a/env.image-ostree
+++ b/env.image-ostree
@ -1,4 +0,0 @@
-DISTRO_OSTREE="-ostree"
-DISTRO_TYPE=""
-
-. ./env.common
--- a/env.image-vcu
+++ b/env.image-vcu
@ -1,5 +0,0 @@
-
-DISTRO_OSTREE="-ostree"
-DISTRO_TYPE="-vcu"
-
-. ./env.common
--- a/env/common
+++ b/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
--- a/env/distro/base-image
+++ b/env/distro/base-image
@ -0,0 +1,4 @@
+DISTRO="netmodule-linux"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/distro/fct-image
+++ b/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
--- a/env/distro/lava-image
+++ b/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
--- a/env/distro/minimal-image
+++ b/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
--- a/env/distro/ostree-image
+++ b/env/distro/ostree-image
@ -0,0 +1,4 @@
+DISTRO="netmodule-linux-ostree"
+BUILD_FOLDER_APPEND=""
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/distro/vcu-image
+++ b/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
--- a/env/interactive-machine-selector
+++ b/env/interactive-machine-selector
@ -4,6 +4,7 @@

 PS3='Please choose a machine: '
 HW16="nrhw16 - NB800"
+HW17="hw17 - NB2800"
 HW18="nrhw18 - NB1800"
 HW20="nrhw20 - NB1601"
 HW21="nmhw21 - VCU1"
@ -13,14 +14,17 @@ HW24="nrhw24 - NB800 facelift"
 HW25="hw25 - TC Router"
 HW26="hw26 - NG800"

-set -a
-select opt in HW16 HW18 HW20 HW21 HW23 DLM HW24 HW25 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
@ -58,3 +62,4 @@ do
 done

 echo $MACHINE
+export MACHINE
--- a/env/machine/hw16
+++ b/env/machine/hw16
@ -0,0 +1,3 @@
+MACHINE=am335x-nrhw16
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw17
+++ b/env/machine/hw17
@ -0,0 +1,3 @@
+MACHINE=armada-385-hw17
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw18
+++ b/env/machine/hw18
@ -0,0 +1,3 @@
+MACHINE=armada-385-nrhw18
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw20
+++ b/env/machine/hw20
@ -0,0 +1,3 @@
+MACHINE=am335x-nrhw20
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw21
+++ b/env/machine/hw21
@ -0,0 +1,3 @@
+MACHINE=am335x-nmhw21
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw23
+++ b/env/machine/hw23
@ -0,0 +1,3 @@
+MACHINE=imx8-nmhw23
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw24
+++ b/env/machine/hw24
@ -0,0 +1,3 @@
+MACHINE=am335x-nmhw24
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw25
+++ b/env/machine/hw25
@ -0,0 +1,3 @@
+MACHINE=am335x-hw25
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/env/machine/hw26
+++ b/env/machine/hw26
@ -0,0 +1,3 @@
+MACHINE=am335x-hw26
+env_path=${BASH_SOURCE:-$0}
+. $(dirname $env_path)/../common
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ab06f2987debdc983c3436ad39bbd50cad20190d
+Subproject commit 3dbca0ef2ae1ea3862e540c59ad77adbcb419d57
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 52a03477a8a74fb77998fdc9650b668e0da52c97
+Subproject commit 901c12f911e4fa4ae351ca6da07e4b4dacd1d6f1
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1c4f322e54e1630f78c7e314e4d498342a394e5f
+Subproject commit 30d95eb8c877bb655cfd11a5dd1f7ba0a533e2b7
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 261cf1775c2336c1e3141be033171d01f0cb8e68
+Subproject commit 7538f89cfdd7624df5c2a7ba9d3ceb01d8536671
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7fe9a70175a40c7d78ff6ccb0c6f5eb5cf7f1329
+Subproject commit 8bd0b8ee7ade4aaec66d0a1dfe4d6aa65e8dd661
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ab04a2ac667067516f51ddbd3ac499986a606813
+Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 389757a7494221fea1d8437e9a01c6e4fb4700af
+Subproject commit 8ff12bfffcf0840d5518788a53d88d708ad3aae0
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 5d49b28570ed030924ed5d45fbced24d3cb6e588
+Subproject commit f2f5ca077baa1f08001cff9608ae59ed4dbeca3d
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 707036d4ec12ef1a260adcef78627b26e32e6540
+Subproject commit 8e81d38048c953d0823abf04d5b2506cd988f0bb