LM
/
yocto-img-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmcImages: mask out the bootloader artifacts using the machine type 

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2021-09-06 19:24:56 +02:00
parent 9a4f1db328
commit deb8763414
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Jenkinsfile_mmcImages
View File

@ -86,7 +86,7 @@ pipeline {
// the bootloader is also built with the dev image, hence we combine it // the bootloader is also built with the dev image, hence we combine it
def isBootLoaderOnly = (params.IMAGE_TYPE == 'bootloader').toBoolean() def isBootLoaderOnly = (params.IMAGE_TYPE == 'bootloader').toBoolean()
if(isBootLoaderOnly || (params.IMAGE_TYPE == 'dev')) { if(isBootLoaderOnly || (params.IMAGE_TYPE == 'dev')) {
createBslPackage(env.IMG_OUTPUT_DIR) createBslPackage(env.IMG_OUTPUT_DIR, params.MACHINE)
archivePackage(yoctocommon, env.IMG_OUTPUT_DIR, 'bootloader', !isBootLoaderOnly) archivePackage(yoctocommon, env.IMG_OUTPUT_DIR, 'bootloader', !isBootLoaderOnly)
} }
@ -152,13 +152,20 @@ def build(imgType) {
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
def createBslPackage(outputDir) { def createBslPackage(outputDir, machine) {
dir(outputDir) { dir(outputDir) {
String machineStr = machine
String[] machineArr = machineStr.split('-')
println "get bootloader artifacts for package..." println "get bootloader artifacts for package..."
sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.img . || true" if(machineArr[0] == 'imx8') {
sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.xmodem.bin . || true" sh "cp ${env.YOCTO_DEPLOYS}/imx-boot ."
sh "cp ${env.YOCTO_DEPLOYS}/imx-boot . || true" sh "cp ${env.YOCTO_DEPLOYS}/imx-boot.sd ."
sh "cp ${env.YOCTO_DEPLOYS}/imx-boot.sd . || true" }
else {
sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.img ."
sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.xmodem.bin ."
}
} }
} }