mmcImages: mask out the bootloader artifacts using the machine type
Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
parent
9a4f1db328
commit
deb8763414
|
|
@ -86,7 +86,7 @@ pipeline {
|
|||
// 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)
|
||||
createBslPackage(env.IMG_OUTPUT_DIR, params.MACHINE)
|
||||
archivePackage(yoctocommon, env.IMG_OUTPUT_DIR, 'bootloader', !isBootLoaderOnly)
|
||||
}
|
||||
|
||||
|
|
@ -152,13 +152,20 @@ def build(imgType) {
|
|||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
def createBslPackage(outputDir) {
|
||||
def createBslPackage(outputDir, machine) {
|
||||
dir(outputDir) {
|
||||
String machineStr = machine
|
||||
String[] machineArr = machineStr.split('-')
|
||||
|
||||
println "get bootloader artifacts for package..."
|
||||
sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.img . || true"
|
||||
sh "cp ${env.YOCTO_DEPLOYS}/*u-boot-${params.MACHINE}*.xmodem.bin . || true"
|
||||
sh "cp ${env.YOCTO_DEPLOYS}/imx-boot . || true"
|
||||
sh "cp ${env.YOCTO_DEPLOYS}/imx-boot.sd . || true"
|
||||
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 ."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue