44 changed files with 871 additions and 167 deletions
--- a/169
+++ b/169
@ -0,0 +1,169 @@
+// common parts for yocto builds
+
+// BUILD_DIR_POSTFIX needs to be defined in the job before
+// loading this module
+env.SHARED_BUILD = "${WORKSPACE}/build${env.BUILD_DIR_POSTFIX}"
+env.BUILD_DEPLOY_DIR = "${env.SHARED_BUILD}/tmp/deploy/images"
+env.BUILD_LICENSE_DIR = "${env.SHARED_BUILD}/tmp/deploy/licenses"
+env.BUILD_HISTORY_DIR = "${env.SHARED_BUILD}/buildhistory"
+env.DISTRO_VERSION_PATHNAME = "${env.SHARED_BUILD}/conf/distro_version.inc"
+env.DOWNLOAD_DIR = "${WORKSPACE}/build-common/downloads"
+env.BINARY_STORAGE_URL = "http://nmrepo.netmodule.intranet/src/yocto-downloads"
+env.SUBMODULE_VERION_FILE = "submodule_revisions"
+env.DISTRO_VERSION_FILE = "distro_version.inc"
+env.AUTOREV_VERSION_FILE = "autorev_revisions.inc"
+env.PACKAGE_NAME = "nm-os"
+
+
+echo "loading common yocto build module..."
+
+
+// Methods declared in external code are accessible
+//   directly from other code in the external file
+//   indirectly via the object created by the load operation
+//   eg.  extcode.build(...)
+
+
+def cleanWorkspace() {
+  println "cleaning workspace..."
+  sh "[[ -d \"${WORKSPACE}/build-common/sstate-cache\" ]] && find \"${WORKSPACE}/build-common/sstate-cache/\" -name \"sstate*\" -atime +3 -delete || true"
+  sh "[[ -d \"${env.SHARED_BUILD}/tmp/work\" ]] && find \"${env.SHARED_BUILD}/tmp/work/\" -name temp -type d -exec rm -rf {} + || true"
+}
+
+
+def isRelease(versionParam) {
+  if((versionParam == "") || (versionParam == "latest")) {
+    return false
+  }
+  return true
+}
+
+
+def handleSubmodules(versionParam) {
+  println "init submodules..."
+  sh 'git submodule update --init'
+  if(isRelease(versionParam)) {
+    println "set submodules to freezed state..."
+    sh 'git submodule update' // set all submodules to freezed commit
+  }
+  else {
+    println "setting netmodule submodule hashes to head..."
+    sh 'git submodule update --remote --rebase meta-netmodule-*' // update our own 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 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 buildVersionString(imageType, actualBaseVersionString, versionParameter) {
+  // official release version
+  if(isRelease(versionParameter)) {
+    String newVersionStr = versionParameter 
+    return newVersionStr
+  }
+
+  // SDK or FCT release
+  if((imageType == 'fct') || (imageType == 'sdk')) {
+    return actualBaseVersionString
+  }
+
+  // nightly/incremental release
+  def buildnbr = getTopUpstreamBuildNumber()
+  String nightlyPart = actualBaseVersionString + ".Test${buildnbr}"
+  return nightlyPart
+}
+
+def getVersionString(versionParam, imageType) {
+  sh 'git fetch -ap'
+  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("-")
+
+  versionArr[0] = buildVersionString(imageType, versionArr[0], versionParam)
+  rlsVersion = versionArr.join("-")
+  return rlsVersion
+}
+
+
+def changeDistroVersion(versionString){
+  println "Set the distro version to ${versionString}..."
+  def versionTag = "DISTRO_VERSION = \"${versionString}\""
+  writeFile(file: "${env.DISTRO_VERSION_PATHNAME}", text: "${versionTag}")
+  sh(script: "cp ${env.DISTRO_VERSION_PATHNAME} ${env.DISTRO_VERSION_FILE}")
+}
+
+def cleanupDistroVersion() {
+  println "cleaning repository regarding distro version..."
+  sh(script:"git clean -f ${env.DISTRO_VERSION_PATHNAME}")
+}
+
+
+def archiveImages(imgageDir, imgType) {
+  dir ('tmp/artifacts') {
+    zip archive: true, dir: "${WORKSPACE}/${imgageDir}", glob: "*", zipFile: "${env.PACKAGE_NAME}-${env.BUILD_VERSION}-${params.MACHINE}-${imgType}.zip"
+  }
+  sh "rm -rf ${WORKSPACE}/tmp/artifacts"
+}
+
+
+def syncSources(src, dst) {
+  def hasSrcUrl = (src.contains("http"))
+  def from = src
+  def to = dst
+
+  // convert the URL into ssh syntax:
+  def url = (hasSrcUrl) ? src : dst
+  String[] repoParts = url.split("//")[1].split("/")
+  repoParts[0] = "build_user@" + repoParts[0] + ":/repo/repo"
+  sshSrc = repoParts.join("/")
+
+  if(hasSrcUrl) {
+    println "getting data from server..."
+    from = sshSrc
+    sh(script: "bash -c \"mkdir -p ${to}\"")
+  }
+  else {
+    println "putting data to server..."
+    to = sshSrc
+  }
+
+  sshagent (credentials: ['7767e711-08a4-4c71-b080-197253dd7392']) {
+    sh "rsync -q -auvz --ignore-existing -e \"ssh\" ${from}/* ${to}"
+  }
+}
+
+
+def getAutoRevHashes(envType) {
+  def env = "${envType}" == "" ? "" : "-${envType}"
+  def revs = sh(returnStdout: true, script: "bash -c \". ./env.image${env} > /dev/null && buildhistory-collect-srcrevs\"").trim()
+  return revs
+}
+
+
+// !!Important Boilerplate!!
+// The external code must return it's contents as an object
+return this;
--- a/153
+++ b/153
@ -0,0 +1,153 @@
+// Loading code requires a NODE context
+// But we want the code accessible outside the node Context
+// So declare yoctocommon (object created by the LOAD operation) outside the Node block.
+def yoctocommon
+
+
+// declarative pipeline
+pipeline {
+  agent {
+    node {
+      label 'oem-ci'
+    }
+  }
+
+  parameters {
+    choice(name: 'MACHINE', choices: ['select...', 'am335x-nrhw20', 'am335x-nmhw21', 'imx8-nmhw23', 'am335x-nmhw24', 'am335x-hw25', 'am335x-hw26'], description: 'choose target platform')
+    choice(name: 'IMAGE_TYPE', choices: ['lava', 'fct', 'minimal'], description: 'choose image type')
+    string(name: 'RLS_VERSION', defaultValue: '', description: 'Set the version to build and use committed submodules')
+    booleanParam(name: 'CLEAN_BUILD', defaultValue: false, description: 'clean all temp directories before build starts')
+  }
+
+  environment {
+    IMG_OUTPUT_DIR = "tmp/build-output"
+  }
+
+  options {
+    timeout(time: 5, unit: 'HOURS')
+    buildDiscarder(
+      logRotator(numToKeepStr: '50',
+                 daysToKeepStr: '7',
+                 artifactNumToKeepStr: '50',
+                 artifactDaysToKeepStr: '7'
+      )
+    )
+    disableConcurrentBuilds()
+  }
+
+  stages {
+    stage('prepare') {
+      steps {
+        script {
+          if("${params.MACHINE}" == "select...") {
+            currentBuild.result = 'ABORTED'
+            error("Missing machine type --> select parameter MACHINE for a proper build")
+          }
+
+          // this definition is needed for selecting the
+          // correct build directory
+          env.BUILD_DIR_POSTFIX = "${params.IMAGE_TYPE}" == "lava" ? "-fct" : "-${params.IMAGE_TYPE}"
+
+          // load yocto common file
+          env.ROOTDIR = pwd()
+          yoctocommon = load "${env.ROOTDIR}/Jenkinsfile_Common"
+
+          // clean-up no longer needed packages
+          yoctocommon.cleanWorkspace()
+
+          // Prepare Build Environment
+          env.YOCTO_DEPLOYS = "${env.BUILD_DEPLOY_DIR}/${params.MACHINE}"
+          yoctocommon.handleSubmodules("${params.RLS_VERSION}")
+          version = yoctocommon.getVersionString("${params.RLS_VERSION}", "${params.IMAGE_TYPE}")
+          env.BUILD_VERSION = "${version}"
+          currentBuild.displayName = "${version}-${params.MACHINE}-${params.IMAGE_TYPE}" //replace Bitbake timestamp after building
+          printJobParameters()
+          yoctocommon.changeDistroVersion("${version}")
+          yoctocommon.syncSources("${env.BINARY_STORAGE_URL}", "${env.DOWNLOAD_DIR}")
+        }
+        writeFile file: 'VERSION', text: "${env.PACKAGE_NAME}: ${env.BUILD_VERSION}"
+      }
+    }
+
+    stage('clean') {
+      when { expression { return params.CLEAN_BUILD } }
+      steps {
+        dir ("${env.SHARED_BUILD}/tmp") { deleteDir() }
+        dir ("${env.SHARED_BUILD}/tmp-glibc") { deleteDir() }
+      }
+    }
+
+    stage('build') {
+      steps {
+        script {
+          build(params.IMAGE_TYPE, params.IMAGE_TYPE)
+          createArchive(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR)
+          yoctocommon.archiveImages(env.IMG_OUTPUT_DIR, params.IMAGE_TYPE)
+          sh "rm -rf ${IMG_OUTPUT_DIR}"
+        }
+      }
+      post {
+        always {
+          script {
+            yoctocommon.syncSources("${env.DOWNLOAD_DIR}", "${env.BINARY_STORAGE_URL}")
+          }
+        }
+      }
+    }
+
+    stage('collect versions') {
+      steps {
+        script {
+          revisions = yoctocommon.getAutoRevHashes(params.IMAGE_TYPE)
+          writeFile(file: "${env.AUTOREV_VERSION_FILE}", text: "${revisions}")
+        }
+      }
+      post {
+        success {
+          archiveArtifacts(artifacts: "${env.SUBMODULE_VERION_FILE}, ${env.AUTOREV_VERSION_FILE}, ${env.DISTRO_VERSION_FILE}", onlyIfSuccessful: false)
+        }
+      }
+    }
+
+  } // stages
+}
+
+
+def printJobParameters() {
+  println "----------------------------------\n\
+  Job Parameters:\n\
+----------------------------------\n\
+    MACHINE        = ${params.MACHINE}\n\
+    IMAGE_TYPE     = ${params.IMAGE_TYPE}\n\
+    CLEAN_BUILD    = ${params.CLEAN_BUILD}\n\
+    RLS_VERSION    = ${params.RLS_VERSION}\n\
+      --> version  = ${env.BUILD_VERSION}\n\
+----------------------------------\n"
+}
+
+
+def build(envType, imgType) {
+  def envPostFix = "${envType}" == "" ? "" : "-${envType}"
+  sh "bash -c '. ./env.image${envPostFix} > /dev/null && bitbake -q -k virtual/netmodule-image'"
+}
+
+
+def createArchive(imgType, outputDir) {
+  def imgTypePostfix = "${imgType}" == "" ? "" : "-${imgType}"
+  dir (outputDir) {
+    def image_basename = "netmodule-linux-image${imgTypePostfix}-${params.MACHINE}"
+    def basename_built = "${env.YOCTO_DEPLOYS}/${image_basename}"
+    def basename_archive = "./image${imgTypePostfix}-${params.MACHINE}"
+
+    sh "cp ${basename_built}.manifest ${basename_archive}.manifest"
+    sh "bash -c '${WORKSPACE}/openembedded-core/scripts/buildhistory-collect-srcrevs -p ${env.BUILD_HISTORY_DIR} > srcrev-${params.MACHINE}${imgTypePostfix}.inc'"
+
+    sh label: 'Copy License Manifest', returnStatus: true, script: """
+        LATEST_LICENSE_DIR=\$(ls -Artd ${env.BUILD_LICENSE_DIR}/netmodule-linux-image${imgTypePostfix}* | tail -n 1)
+        cp \$LATEST_LICENSE_DIR/license.manifest ${basename_archive}_license.manifest
+        """
+
+    sh "cp ${env.YOCTO_DEPLOYS}/fitImage-${image_basename}-${params.MACHINE} fitImage-${image_basename}"
+    sh "cp ${basename_built}.cpio.gz ${basename_archive}.cpio.gz"
+  }
+}
--- a/216
+++ b/216
@ -0,0 +1,216 @@
+// Loading code requires a NODE context
+// But we want the code accessible outside the node Context
+// So declare yoctocommon (object created by the LOAD operation) outside the Node block.
+def yoctocommon
+
+
+// declarative pipeline
+pipeline {
+  agent {
+    node {
+      label 'oem-ci'
+    }
+  }
+
+  parameters {
+    choice(name: 'MACHINE', choices: ['select...', 'am335x-nrhw20', 'am335x-nmhw21', 'imx8-nmhw23', 'am335x-nmhw24', 'am335x-hw25', 'am335x-hw26'], description: 'choose target platform')
+    choice(name: 'IMAGE_TYPE', choices: ['dev', 'bootloader', 'release'], description: 'choose image type')
+    string(name: 'RLS_VERSION', defaultValue: '', description: 'Set the version to build and use committed submodules')
+    booleanParam(name: 'CLEAN_BUILD', defaultValue: false, description: 'clean all temp directories before build starts')
+  }
+
+  environment {
+    WORK_DIR = "tmp"
+    IMG_OUTPUT_DIR = "${WORK_DIR}/build-output"
+  }
+
+  options {
+    timeout(time: 5, unit: 'HOURS')
+    buildDiscarder(
+      logRotator(numToKeepStr: '50',
+                 daysToKeepStr: '7',
+                 artifactNumToKeepStr: '50',
+                 artifactDaysToKeepStr: '7'
+      )
+    )
+    disableConcurrentBuilds()
+  }
+
+  stages {
+    stage('prepare') {
+      steps {
+        script {
+          if("${params.MACHINE}" == "select...") {
+            currentBuild.result = 'ABORTED'
+            error("Missing machine type --> select parameter MACHINE for a proper build")
+          }
+
+          cleanLeftOvers(env.IMG_OUTPUT_DIR)
+
+          // this definition is needed for selecting the
+          // correct build directory
+          env.BUILD_DIR_POSTFIX = ""
+
+          // load yocto common file
+          env.ROOTDIR = pwd()
+          yoctocommon = load "${env.ROOTDIR}/Jenkinsfile_Common"
+
+          // clean-up no longer needed packages
+          yoctocommon.cleanWorkspace()
+
+          // Prepare Build Environment
+          env.YOCTO_DEPLOYS = "${env.BUILD_DEPLOY_DIR}/${params.MACHINE}"
+          yoctocommon.handleSubmodules("${params.RLS_VERSION}")
+          version = yoctocommon.getVersionString("${params.RLS_VERSION}", "${params.IMAGE_TYPE}")
+          env.BUILD_VERSION = "${version}"
+          currentBuild.displayName = "${version}-${params.MACHINE}-${params.IMAGE_TYPE}" //replace Bitbake timestamp after building
+          printJobParameters()
+          yoctocommon.changeDistroVersion("${version}")
+          yoctocommon.syncSources("${env.BINARY_STORAGE_URL}", "${env.DOWNLOAD_DIR}")
+        }
+        writeFile file: 'VERSION', text: "${env.PACKAGE_NAME}: ${env.BUILD_VERSION}"
+      }
+    }
+
+    stage('clean') {
+      when { expression { return params.CLEAN_BUILD } }
+      steps {
+        dir ("${SHARED_BUILD}/tmp") { deleteDir() }
+        dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
+      }
+    }
+
+    stage('build') {
+      steps {
+        script {
+          build(params.IMAGE_TYPE)
+
+          // archive a bootloader package:
+          //   the bootloader is also built with the dev image, hence we combine it
+          def isBootLoaderOnly = (params.IMAGE_TYPE == 'bootloader').toBoolean()
+          if(isBootLoaderOnly || (params.IMAGE_TYPE == 'dev')) {
+            createBslPackage(env.IMG_OUTPUT_DIR, params.MACHINE)
+            archivePackage(yoctocommon, env.IMG_OUTPUT_DIR, 'bootloader', !isBootLoaderOnly)
+          }
+
+          // archive an image package:
+          //   skip for bootloader only builds
+          if(!isBootLoaderOnly) {
+            createImagePackage(params.IMAGE_TYPE, env.IMG_OUTPUT_DIR)
+            archiveOSTreeArtifact(env.IMG_OUTPUT_DIR)
+            archivePackage(yoctocommon, env.IMG_OUTPUT_DIR, params.IMAGE_TYPE, false)
+          }
+        }
+      }
+      post {
+        always {
+          script {
+            cleanLeftOvers(env.WORK_DIR)
+            yoctocommon.syncSources("${env.DOWNLOAD_DIR}", "${env.BINARY_STORAGE_URL}")
+          }
+        }
+      }
+    }
+
+    stage('collect versions') {
+      steps {
+        script {
+          revisions = yoctocommon.getAutoRevHashes('ostree')
+          writeFile(file: "${env.AUTOREV_VERSION_FILE}", text: "${revisions}")
+        }
+      }
+      post {
+        success {
+          archiveArtifacts(artifacts: "${env.SUBMODULE_VERION_FILE}, ${env.AUTOREV_VERSION_FILE}, ${env.DISTRO_VERSION_FILE}", onlyIfSuccessful: false)
+        }
+      }
+    }
+
+  } // stages
+}
+
+//-----------------------------------------------------------------------------
+def printJobParameters() {
+  println "----------------------------------\n\
+  Job Parameters:\n\
+----------------------------------\n\
+    MACHINE        = ${params.MACHINE}\n\
+    IMAGE_TYPE     = ${params.IMAGE_TYPE}\n\
+    CLEAN_BUILD    = ${params.CLEAN_BUILD}\n\
+    RLS_VERSION    = ${params.RLS_VERSION}\n\
+      --> version  = ${env.BUILD_VERSION}\n\
+----------------------------------\n"
+}
+
+//-----------------------------------------------------------------------------
+def cleanLeftOvers(cleaningDir) {
+  sh "rm -rf ${cleaningDir}"
+}
+
+//-----------------------------------------------------------------------------
+def build(imgType) {
+  def tgtImgType = "${imgType}" == "bootloader" ? "dev" : "${imgType}"
+  def imgTypePostfix = "${tgtImgType}" == "" ? "" : "-${tgtImgType}"
+  sh "bash -c '. ./env.image-ostree > /dev/null && bitbake -q -k netmodule-linux-image${imgTypePostfix}'"
+}
+
+//-----------------------------------------------------------------------------
+def createBslPackage(outputDir, machine) {
+  dir(outputDir) {
+    String machineStr = machine
+    String[] machineArr = machineStr.split('-')
+
+    println "get bootloader artifacts for package..."
+    if(machineArr[0] == 'imx8') {
+      sh "cp ${env.YOCTO_DEPLOYS}/imx-boot ."
+      sh "cp ${env.YOCTO_DEPLOYS}/imx-boot.sd ."
+    }
+    else {
+      sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.img ."
+      sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.xmodem.bin ."
+    }
+  }
+}
+
+//-----------------------------------------------------------------------------
+def createImagePackage(imgType, outputDir) {
+  dir (outputDir) {
+    println "get image artifacts for package..."
+    def imgTypePostfix = "${imgType}" == "" ? "" : "-${imgType}"
+    def image_basename = "netmodule-linux-image${imgTypePostfix}-${params.MACHINE}"
+    def basename_built = "${env.YOCTO_DEPLOYS}/${image_basename}"
+    def basename_archive = "./image${imgTypePostfix}-${params.MACHINE}"
+
+    sh "cp ${basename_built}.manifest ${basename_archive}.manifest"
+    sh "bash -c '${WORKSPACE}/openembedded-core/scripts/buildhistory-collect-srcrevs -p ${env.BUILD_HISTORY_DIR} > srcrev-${params.MACHINE}${imgTypePostfix}.inc'"
+
+    sh label: 'Copy License Manifest', returnStatus: true, script: """
+        LATEST_LICENSE_DIR=\$(ls -Artd ${env.BUILD_LICENSE_DIR}/netmodule-linux-image${imgTypePostfix}* | tail -n 1)
+        cp \$LATEST_LICENSE_DIR/license.manifest ${basename_archive}_license.manifest
+        """
+
+    sh label: 'Copy initramfs License Manifest', returnStatus: true, script: """
+        LATEST_LICENSE_DIR=\$(ls -Artd ${env.BUILD_LICENSE_DIR}/initramfs-ostree-image-${params.MACHINE}-* | tail -n 1)
+        cp \$LATEST_LICENSE_DIR/license.manifest initramfs-ostree-image_license.manifest
+        """
+
+    sh "cp ${basename_built}.ota-ext4 ${basename_archive}.ota-ext4"
+    sh "cp ${basename_built}.wic ${basename_archive}.wic"
+    sh "tar czf ./ostree_repo${imgTypePostfix}.tar.gz -C ${env.YOCTO_DEPLOYS}/ostree_repo ."
+  }
+}
+
+//-----------------------------------------------------------------------------
+def archivePackage(yoctocommon, pkgDir, imgType, doCleanPkgDir) {
+  yoctocommon.archiveImages(pkgDir, imgType)
+  if(doCleanPkgDir) {
+    println "cleaning pkgDir..."
+    sh "rm -rf ./${pkgDir}/*"
+  }
+}
+
+//-----------------------------------------------------------------------------
+def archiveOSTreeArtifact(outputDir) {
+  archiveArtifacts artifacts: "${outputDir}/ostree_repo*.tar.gz", onlyIfSuccessful: true
+  sh "rm -f ./${outputDir}/ostree_repo*.tar.gz"
+}
--- a/159
+++ b/159
@ -0,0 +1,159 @@
+// Loading code requires a NODE context
+// But we want the code accessible outside the node Context
+// So declare yoctocommon (object created by the LOAD operation) outside the Node block.
+def yoctocommon
+
+
+// declarative pipeline
+pipeline {
+  agent {
+    node {
+      label "${params.NODE_NAME}"
+    }
+  }
+
+  parameters {
+    choice(name: 'MACHINE', choices: ['select...', 'am335x-nrhw20', 'am335x-nmhw21', 'imx8-nmhw23', 'am335x-nmhw24', 'am335x-hw25', 'am335x-hw26'], description: 'choose target platform')
+    string(name: 'RLS_VERSION', defaultValue: '', description: 'Set the version to build and use committed submodules')
+    string(name: 'NODE_NAME', defaultValue: 'oem-ci', description: 'Enter a specific node name')
+    booleanParam(name: 'CLEAN_BUILD', defaultValue: false, description: 'clean all temp directories before build starts')
+    booleanParam(name: 'BUILD_FROM_DEV_IMAGE', defaultValue: false, description: 'build SDK from dev image')
+  }
+
+  environment {
+    // SDK Build Parameter (default is recipe netmodule-linux-sdk)
+    IS_NM_LINUX_SDK = "${!params.BUILD_FROM_DEV_IMAGE}"
+  }
+
+  options {
+    timeout(time: 5, unit: 'HOURS')
+    buildDiscarder(
+      logRotator(numToKeepStr: '5',
+                 daysToKeepStr: '5',
+                 artifactNumToKeepStr: '5',
+                 artifactDaysToKeepStr: '5'
+      )
+    )
+  }
+
+  stages {
+    stage('prepare') {
+      steps {
+        script {
+          if("${params.MACHINE}" == "select...") {
+            currentBuild.result = 'ABORTED'
+            error("Missing machine type --> select parameter MACHINE for a proper build")
+          }
+
+          // this definition is needed for selecting the
+          // correct build directory
+          env.BUILD_DIR_POSTFIX = ""
+
+          // load yocto common file
+          env.ROOTDIR = pwd()
+          yoctocommon = load "${env.ROOTDIR}/Jenkinsfile_Common"
+
+          // clean-up no longer needed packages
+          yoctocommon.cleanWorkspace()
+
+          // Prepare Build Environment
+          env.YOCTO_DEPLOYS = "${env.SHARED_BUILD}/tmp/deploy/sdk"
+          yoctocommon.handleSubmodules("${params.RLS_VERSION}")
+          cleanLastBuildArtifacts()
+          version = yoctocommon.getVersionString("${params.RLS_VERSION}", "sdk")
+          env.BUILD_VERSION = "${version}"
+          currentBuild.displayName = "${version}-${params.MACHINE}-sdk" //replace Bitbake timestamp after building
+          printJobParameters()
+          yoctocommon.changeDistroVersion("${version}")
+          yoctocommon.syncSources("${env.BINARY_STORAGE_URL}", "${env.DOWNLOAD_DIR}")
+        }
+        writeFile file: 'VERSION', text: "${env.PACKAGE_NAME}: ${env.BUILD_VERSION}"
+      }
+    }
+
+    stage('clean') {
+      when { expression { return params.CLEAN_BUILD } }
+      steps {
+        dir ("${SHARED_BUILD}/tmp") { deleteDir() }
+        dir ("${SHARED_BUILD}/tmp-glibc") { deleteDir() }
+      }
+    }
+
+    stage('build') {
+      steps {
+        script {
+          if(env.IS_NM_LINUX_SDK.toBoolean()) {
+            sh "bash -c '. ./env.image-ostree && bitbake -q netmodule-linux-sdk'"
+          }
+          else {
+            sh "bash -c '. ./env.image-ostree && bitbake -q -fc populate_sdk netmodule-linux-image-dev'"
+          }
+        }
+      }
+      post {
+        success {
+          script{
+            deploySdkToArtifactory(params.BUILD_FROM_DEV_IMAGE, "${params.MACHINE}")
+          }
+        } // success
+        always {
+          script {
+            yoctocommon.syncSources("${env.DOWNLOAD_DIR}", "${env.BINARY_STORAGE_URL}")
+          }
+        } // always
+      }
+    }
+
+  } // stages
+}
+
+
+def printJobParameters() {
+  println "----------------------------------\n\
+  Job Parameters:\n\
+----------------------------------\n\
+    MACHINE         = ${params.MACHINE}\n\
+    CLEAN_BUILD     = ${params.CLEAN_BUILD}\n\
+    IS_NM_LINUX_SDK = ${env.IS_NM_LINUX_SDK}\n\
+    RLS_VERSION     = ${params.RLS_VERSION}\n\
+      --> version   = ${env.BUILD_VERSION}\n\
+----------------------------------\n"
+}
+
+
+def cleanLastBuildArtifacts() {
+  println "cleaning artifacts from last build..."
+  sh "rm -f ${env.YOCTO_DEPLOYS}/*"
+  sh "bash -c 'git fetch -ap'"
+  sh "bash -c '. ./env.image-ostree > /dev/null && bitbake -q -c cleanall netmodule-linux-sdk'"
+}
+
+
+def deploySdkToArtifactory(isBuildFromDev, machine) {
+  def cpuType = machine.split("-")[0]
+  def sdkArtifact = sh(returnStdout: true, script: "ls ${env.YOCTO_DEPLOYS}/netmodule-linux-ostree*-netmodule-linux-*.sh").trim()
+  if(isBuildFromDev) {
+    def jenkinsBaseUrl = "https://jenkins.netmodule.intranet"
+    def workspaceUrl = "${jenkinsBaseUrl}/job/NMOS/job/build-sdk/job/${env.BRANCH_NAME}/${currentBuild.number}/execution/node/3/ws/build/tmp/deploy/sdk"
+    def artifactFile = sh(returnStdout: true, script: "basename ${sdkArtifact}")
+    println "Download link of image-sdk (cpuType=${cpuType}): ${workspaceUrl}/${artifactFile}"
+    return
+  }
+
+  println "Deploying ${sdkArtifact} (cpuType=${cpuType}) to NEXUS..."
+  nexusArtifactUploader(
+    nexusVersion: "nexus3",
+    protocol: "https",
+    nexusUrl: "repo.netmodule.intranet:443",
+    groupId: "nm.sdk",
+    version: "latest",
+    repository: "nm-os",
+    credentialsId: "0099cd5a-81d4-4698-9b55-1206895d19fb",
+    artifacts: [
+      [artifactId: "${cpuType}",
+       classifier: "",
+       file: "${sdkArtifact}",
+       type: "sh"]
+    ]
+  );
+}
--- a/116
+++ b/116
@ -0,0 +1,116 @@
+// declarative pipeline
+pipeline {
+  agent {
+    node {
+      label 'oem-linux'
+    }
+  }
+
+  parameters {
+    booleanParam(name: 'UPDATE_NM_PARTS', defaultValue: true, description: 'update the netmodule submodules')
+    booleanParam(name: 'UPDATE_COMMUNITY_PARTS', defaultValue: false, description: 'update the the community submodules')
+  }
+
+  environment {
+    SUBMODULE_VERION_FILE = "submodule_revisions"
+  }
+
+  options {
+    timeout(time: 1, unit: 'HOURS')
+    buildDiscarder(
+      logRotator(numToKeepStr: '5',
+                 daysToKeepStr: '5',
+                 artifactNumToKeepStr: '5',
+                 artifactDaysToKeepStr: '5'
+      )
+    )
+    disableConcurrentBuilds()
+  }
+
+  stages {
+    stage('prepare') {
+      steps {
+        script {
+          printJobParameters()
+          prepareUpdate()
+        }
+      }
+    }
+
+    stage('update to head') {
+      steps {
+        script {
+          updateSubmodules(params.UPDATE_NM_PARTS, params.UPDATE_COMMUNITY_PARTS)
+        }
+      }
+      post {
+        success {
+          archiveArtifacts(artifacts: "${env.SUBMODULE_VERION_FILE}", onlyIfSuccessful: false)
+          sh "rm -f ${env.SUBMODULE_VERION_FILE}"
+        }
+      }
+    }
+
+    stage('commit') {
+      steps {
+        commitChanges(params.UPDATE_NM_PARTS, params.UPDATE_COMMUNITY_PARTS)
+      }
+    }
+
+  } // stages
+}
+
+
+def printJobParameters() {
+  println "----------------------------------\n\
+  Job Parameters:\n\
+----------------------------------\n\
+    UPDATE_NM_PARTS        = ${params.UPDATE_NM_PARTS}\n\
+    UPDATE_COMMUNITY_PARTS = ${params.UPDATE_COMMUNITY_PARTS}\n\
+----------------------------------\n"
+}
+
+def prepareUpdate() {
+  sh 'git submodule update --init'  // init submodules used if first checkout
+
+  def userId = "${currentBuild.getBuildCauses()[0].userId}"
+  def userName = "${currentBuild.getBuildCauses()[0].userName}"
+  if("${userId}" == "null") {
+    userId = "downstream"
+    userName = "Jenkins"
+  }
+  env.TRIGGERED_USER = "${userName} (userId=${userId})"
+
+  def notNmUpdate = "${!params.UPDATE_NM_PARTS}"
+  def notCommunityUpdate = "${!params.UPDATE_COMMUNITY_PARTS}"
+  if(notNmUpdate.toBoolean() && notCommunityUpdate.toBoolean()) {
+    error("Nothing to update selected - both parameters are false")
+  }
+}
+
+def updateSubmodules(isNmUpdate, isCommunityUpdate) {
+  if(isNmUpdate) {
+    sh(script: "git submodule update --remote --rebase meta-netmodule-*")
+  }
+  if(isCommunityUpdate) {
+    sh(script: "git submodule update --remote --rebase \$(git submodule status | grep -v \"meta-netmodule-*\" | sed 's/^ *//g' | cut -d' ' -f2)")
+  }
+  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 commitChanges(isNmUpdate, isCommunityUpdate) {
+  String updatedLayers = ""
+  if(isNmUpdate) { updatedLayers += "netmodule"}
+  if(isNmUpdate && isCommunityUpdate) { updatedLayers += " and " }
+  if(isCommunityUpdate) { updatedLayers += "community" }
+  sh(script: "git checkout ${env.BRANCH_NAME}")
+  sh(script: "git add -u")
+  stagedData = sh(returnStdout: true, script: "git diff --cached").trim()
+  if("${stagedData}" == "") {
+    println "everything up to date, nothing to commit"
+    return
+  }
+  sh(script: "git commit -m \"submodules: updated ${updatedLayers} hashes, triggered by ${env.TRIGGERED_USER}\" && git push")
+}
--- a/autorev-packages.inc
+++ b/autorev-packages.inc
@ -1,54 +0,0 @@
-#./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 0784db7dd0fef6f0621ad8d74372f44e87fef950
+Subproject commit c2a3bda3a29e12472ef7862e424ea1552fab2959
--- a/build-fct/conf/local.conf
+++ b/build-fct/conf/local.conf
@ -1,5 +1,5 @@
-BB_NUMBER_THREADS ?= "8"
-PARALLEL_MAKE ?= "-j 8"
+BB_NUMBER_THREADS ?= "4"
+PARALLEL_MAKE ?= "-j 4"
 PACKAGE_CLASSES ?= "package_rpm"
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 PATCHRESOLVE = "noop"
@ -7,9 +7,11 @@ 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,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
 ASSUME_PROVIDED += "libsdl-native"
 CONF_VERSION = "1"
 EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
@ -33,9 +35,6 @@ 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 = "\
@ -44,5 +43,4 @@ PREMIRRORS_prepend = "\
   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
@ -1 +1 @@
-../meta-netmodule-fct/conf
+meta/conf
--- a/build-minimal/conf/local.conf
+++ b/build-minimal/conf/local.conf
@ -1,5 +1,5 @@
-BB_NUMBER_THREADS ?= "8"
-PARALLEL_MAKE ?= "-j 8"
+BB_NUMBER_THREADS ?= "4"
+PARALLEL_MAKE ?= "-j 4"
 PACKAGE_CLASSES ?= "package_rpm"
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 PATCHRESOLVE = "noop"
@ -7,9 +7,11 @@ 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,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
 ASSUME_PROVIDED += "libsdl-native"
 CONF_VERSION = "1"
 EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
@ -33,9 +35,6 @@ 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 = "\
@ -44,5 +43,4 @@ 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/local.conf
+++ b/build/conf/local.conf
@ -1,5 +1,5 @@
-BB_NUMBER_THREADS ?= "8"
-PARALLEL_MAKE ?= "-j 8"
+BB_NUMBER_THREADS ?= "4"
+PARALLEL_MAKE ?= "-j 4"
 PACKAGE_CLASSES ?= "package_rpm"
 USER_CLASSES ?= "buildstats image-mklibs image-prelink"
 PATCHRESOLVE = "noop"
@ -7,9 +7,11 @@ 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,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
 ASSUME_PROVIDED += "libsdl-native"
 CONF_VERSION = "1"
 EXTRA_IMAGE_FEATURES_append = " debug-tweaks"
@ -33,9 +35,6 @@ 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 = "\
@ -44,6 +43,4 @@ 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
@ -1 +0,0 @@
-../meta-netmodule-distro/conf
--- a/env.common
+++ b/env.common
@ -0,0 +1,15 @@
+if [ -z "$DISTRO" ]; then
+    echo "No distro selected. Please source a helper script (env.*)"
+fi
+
+if [ -z "$MACHINE" ]; then
+    . ./machine_select
+fi
+
+echo Building for machine $MACHINE, distro: $DISTRO
+
+export DISTRO
+export MACHINE
+export OSTREE_OSNAME=nm-linux
+
+. ./openembedded-core/oe-init-build-env build$BUILD_FOLDER_APPEND
--- a/env.image
+++ b/env.image
@ -0,0 +1,3 @@
+DISTRO="netmodule-linux"
+BUILD_FOLDER_APPEND=""
+. ./env.common
--- a/env.image-fct
+++ b/env.image-fct
@ -0,0 +1,3 @@
+DISTRO="netmodule-linux-fct"
+BUILD_FOLDER_APPEND="-fct"
+. ./env.common
--- a/env.image-lava
+++ b/env.image-lava
@ -0,0 +1,3 @@
+DISTRO="netmodule-linux-lava"
+BUILD_FOLDER_APPEND="-fct"
+. ./env.common
--- a/env/distro/minimal-image
+++ b/env/distro/minimal-image
@ -1,4 +1,3 @@
 DISTRO="netmodule-linux-minimal"
 BUILD_FOLDER_APPEND="-minimal"
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
+. ./env.common
--- a/env.image-ostree
+++ b/env.image-ostree
@ -0,0 +1,3 @@
+DISTRO="netmodule-linux-ostree"
+BUILD_FOLDER_APPEND=""
+. ./env.common
--- a/env.image-vcu
+++ b/env.image-vcu
@ -0,0 +1,3 @@
+DISTRO="netmodule-linux-ostree-vcu"
+BUILD_FOLDER_APPEND=""
+. ./env.common
--- a/env/common
+++ b/env/common
@ -1,24 +0,0 @@
-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
@ -1,4 +0,0 @@
-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
@ -1,4 +0,0 @@
-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
@ -1,4 +0,0 @@
-DISTRO="netmodule-linux-lava"
-BUILD_FOLDER_APPEND="-fct"
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/distro/ostree-image
+++ b/env/distro/ostree-image
@ -1,4 +0,0 @@
-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
@ -1,4 +0,0 @@
-DISTRO="netmodule-linux-ostree-vcu"
-BUILD_FOLDER_APPEND=""
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw16
+++ b/env/machine/hw16
@ -1,3 +0,0 @@
-MACHINE=am335x-nrhw16
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw17
+++ b/env/machine/hw17
@ -1,3 +0,0 @@
-MACHINE=armada-385-hw17
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw18
+++ b/env/machine/hw18
@ -1,3 +0,0 @@
-MACHINE=armada-385-nrhw18
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw20
+++ b/env/machine/hw20
@ -1,3 +0,0 @@
-MACHINE=am335x-nrhw20
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw21
+++ b/env/machine/hw21
@ -1,3 +0,0 @@
-MACHINE=am335x-nmhw21
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw23
+++ b/env/machine/hw23
@ -1,3 +0,0 @@
-MACHINE=imx8-nmhw23
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw24
+++ b/env/machine/hw24
@ -1,3 +0,0 @@
-MACHINE=am335x-nmhw24
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw25
+++ b/env/machine/hw25
@ -1,3 +0,0 @@
-MACHINE=am335x-hw25
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/machine/hw26
+++ b/env/machine/hw26
@ -1,3 +0,0 @@
-MACHINE=am335x-hw26
-env_path=${BASH_SOURCE:-$0}
-. $(dirname $env_path)/../common
--- a/env/interactive-machine-selector
+++ b/env/interactive-machine-selector
@ -4,7 +4,6 @@

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

-select opt in HW16 HW17 HW18 HW20 HW21 HW23 DLM HW24 HW25 HW26
+select opt in HW16 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
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3dbca0ef2ae1ea3862e540c59ad77adbcb419d57
+Subproject commit 12c3eed6a90b436565126d8ba6934f794b816e25
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 901c12f911e4fa4ae351ca6da07e4b4dacd1d6f1
+Subproject commit 554d477873d877563f9f46bc10fdc43afcd369bc
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 30d95eb8c877bb655cfd11a5dd1f7ba0a533e2b7
+Subproject commit fa2957f59ac5c0900080e1a426cbd45d894ab777
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 7538f89cfdd7624df5c2a7ba9d3ceb01d8536671
+Subproject commit f2386004959ca7e311fccf083f301c0d53003a08
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8bd0b8ee7ade4aaec66d0a1dfe4d6aa65e8dd661
+Subproject commit b9300d6c34aa6a3b4b62d8edc9abdffc388415d2
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit afeb746c8e8d3b6daf5f05cdb1e692ea593db696
+Subproject commit 6bf77c5803385d1174438545bcf897637765afaf
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8ff12bfffcf0840d5518788a53d88d708ad3aae0
+Subproject commit 4a0d93d250576177e1237fa559f55c4f9d371809
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f2f5ca077baa1f08001cff9608ae59ed4dbeca3d
+Subproject commit 5d49b28570ed030924ed5d45fbced24d3cb6e588
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 8e81d38048c953d0823abf04d5b2506cd988f0bb
+Subproject commit ce78c16409363741d59a2f787aca66077bec93cd