functions: Always pull all three pbuilder roots
We have native packages that depend on cross packages. In an isolated package
build, this causes the pbuilder root to be regenerated for those cross packages.
Change-Id: I2e0c74974cd674e2087e805cca52f7ec99e36be3
diff --git a/vars/functions.groovy b/vars/functions.groovy
index 8724934..9ed7e7a 100644
--- a/vars/functions.groovy
+++ b/vars/functions.groovy
@@ -68,12 +68,9 @@
// archiveArtifacts includes the relative path to the
// files we archive, so we don't have to specify cache/
// here in the target.
- if (needsNative) {
- copyArtifacts(projectName: 'global.pbuilder.arm64', filter: '**/*.tgz')
- copyArtifacts(projectName: 'global.pbuilder.armhf', filter: '**/*.tgz')
- } else {
- copyArtifacts(projectName: 'global.pbuilder.cross', filter: '**/*.tgz')
- }
+ copyArtifacts(projectName: 'global.pbuilder.arm64', filter: '**/*.tgz')
+ copyArtifacts(projectName: 'global.pbuilder.armhf', filter: '**/*.tgz')
+ copyArtifacts(projectName: 'global.pbuilder.cross', filter: '**/*.tgz')
}
def buildTarget(targetName) {
