Compare commits

..

No commits in common. "main" and "1.1.1" have entirely different histories.
main ... 1.1.1

49 changed files with 238 additions and 1611 deletions

24
.gitmodules vendored
View File

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

155
Jenkinsfile vendored Normal file
View File

@ -0,0 +1,155 @@
// 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 ."
}
}
}

File diff suppressed because it is too large Load Diff

View File

@ -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}"

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

View File

@ -1,25 +0,0 @@
# 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 \
"

View File

@ -1,48 +0,0 @@
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

View File

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

View File

@ -1,24 +0,0 @@
# 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 \
"

View File

@ -1,48 +0,0 @@
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

View File

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

View File

@ -9,7 +9,6 @@ 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 \
@ -20,5 +19,10 @@ BBLAYERS ?= " \
${YOCTOROOT}/meta-updater \
${YOCTOROOT}/meta-freescale \
${YOCTOROOT}/meta-ublox-module \
${YOCTOROOT}/meta-netmodule-om \
"
# 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)} \
"

View File

@ -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"
@ -20,11 +22,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 <alexandre.bard@netmodule.com>"
BUILDHISTORY_COMMIT_AUTHOR = "Mr Jenkins <ramon.moesching@netmodule.com>"
# Mirror GIT repo in download folders
BB_GENERATE_MIRROR_TARBALLS = "1"
# Add licences file to the rootfs
COPY_LIC_MANIFEST = "1"
@ -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 = "\
@ -43,7 +42,3 @@ 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

View File

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

20
env.common Normal file
View File

@ -0,0 +1,20 @@
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

4
env.image Normal file
View File

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

4
env.image-fct Normal file
View File

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

4
env.image-lava Normal file
View File

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

4
env.image-minimal Normal file
View File

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

4
env.image-ostree Normal file
View File

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

5
env.image-vcu Normal file
View File

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

24
env/common vendored
View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

3
env/machine/hw16 vendored
View File

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

3
env/machine/hw17 vendored
View File

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

3
env/machine/hw18 vendored
View File

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

3
env/machine/hw20 vendored
View File

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

3
env/machine/hw21 vendored
View File

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

3
env/machine/hw23 vendored
View File

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

3
env/machine/hw24 vendored
View File

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

3
env/machine/hw25 vendored
View File

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

3
env/machine/hw26 vendored
View File

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

View File

@ -4,27 +4,21 @@
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"
select opt in HW16 HW17 HW18 HW20 HW21 HW23 DLM HW24 HW25 HW26
set -a
select opt in HW16 HW18 HW20 HW21 HW23 HW24 HW26
do
case $opt in
HW16)
MACHINE=am335x-nrhw16
break
;;
HW17)
MACHINE=armada-385-hw17
break
;;
HW18)
MACHINE=armada-385-nrhw18
break
@ -41,18 +35,10 @@ 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
@ -62,4 +48,3 @@ do
done
echo $MACHINE
export MACHINE

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

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

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

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

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

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

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

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

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

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

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