| 1 |
commit: 95436406f0010275ce5fdb6142b916ca66f91af0 |
| 2 |
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 18:47:19 2021 +0000 |
| 4 |
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 18:47:19 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=95436406 |
| 7 |
|
| 8 |
Don't use binary or build some packages |
| 9 |
|
| 10 |
Signed-off-by: Magnus Granberg <zorry <AT> gentoo.org> |
| 11 |
|
| 12 |
buildbot_gentoo_ci/steps/builders.py | 32 ++++++++++++++++++++++++++++++++ |
| 13 |
1 file changed, 32 insertions(+) |
| 14 |
|
| 15 |
diff --git a/buildbot_gentoo_ci/steps/builders.py b/buildbot_gentoo_ci/steps/builders.py |
| 16 |
index 81d6e95..21472c7 100644 |
| 17 |
--- a/buildbot_gentoo_ci/steps/builders.py |
| 18 |
+++ b/buildbot_gentoo_ci/steps/builders.py |
| 19 |
@@ -255,6 +255,11 @@ class RunEmerge(BuildStep): |
| 20 |
shell_commad_list.append('--changed-use') |
| 21 |
shell_commad_list.append('--pretend') |
| 22 |
shell_commad_list.append('@world') |
| 23 |
+ # don't build bin for virtual and acct-* |
| 24 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 25 |
+ shell_commad_list.append('virtual') |
| 26 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 27 |
+ shell_commad_list.append('acct-*') |
| 28 |
aftersteps_list.append( |
| 29 |
steps.SetPropertyFromCommandNewStyle( |
| 30 |
command=shell_commad_list, |
| 31 |
@@ -269,6 +274,11 @@ class RunEmerge(BuildStep): |
| 32 |
shell_commad_list.append('--changed-deps') |
| 33 |
shell_commad_list.append('--changed-use') |
| 34 |
shell_commad_list.append('@world') |
| 35 |
+ # don't build bin for virtual and acct-* |
| 36 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 37 |
+ shell_commad_list.append('virtual') |
| 38 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 39 |
+ shell_commad_list.append('acct-*') |
| 40 |
aftersteps_list.append( |
| 41 |
steps.SetPropertyFromCommandNewStyle( |
| 42 |
command=shell_commad_list, |
| 43 |
@@ -338,8 +348,19 @@ class RunEmerge(BuildStep): |
| 44 |
aftersteps_list.append(CheckEmergeLogs('match')) |
| 45 |
|
| 46 |
if self.step == 'pre-build': |
| 47 |
+ cpv = self.getProperty("cpv") |
| 48 |
+ c = yield catpkgsplit(cpv)[0] |
| 49 |
+ p = yield catpkgsplit(cpv)[1] |
| 50 |
shell_commad_list.append('-p') |
| 51 |
shell_commad_list.append('=' + self.getProperty('cpv')) |
| 52 |
+ # we don't use the bin for the requsted cpv |
| 53 |
+ shell_commad_list.append('--usepkg-exclude') |
| 54 |
+ shell_commad_list.append(c + '/' + p) |
| 55 |
+ # don't build bin for virtual and acct-* |
| 56 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 57 |
+ shell_commad_list.append('virtual') |
| 58 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 59 |
+ shell_commad_list.append('acct-*') |
| 60 |
aftersteps_list.append( |
| 61 |
steps.SetPropertyFromCommandNewStyle( |
| 62 |
command=shell_commad_list, |
| 63 |
@@ -351,10 +372,21 @@ class RunEmerge(BuildStep): |
| 64 |
aftersteps_list.append(CheckEmergeLogs('pre-build')) |
| 65 |
|
| 66 |
if self.step == 'build': |
| 67 |
+ cpv = self.getProperty("cpv") |
| 68 |
+ c = yield catpkgsplit(cpv)[0] |
| 69 |
+ p = yield catpkgsplit(cpv)[1] |
| 70 |
shell_commad_list.append('-q') |
| 71 |
if projects_emerge_options['oneshot']: |
| 72 |
shell_commad_list.append('-1') |
| 73 |
shell_commad_list.append('=' + self.getProperty('cpv')) |
| 74 |
+ # we don't use the bin for the requsted cpv |
| 75 |
+ shell_commad_list.append('--usepkg-exclude') |
| 76 |
+ shell_commad_list.append(c + '/' + p) |
| 77 |
+ # don't build bin for virtual and acct-* |
| 78 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 79 |
+ shell_commad_list.append('virtual') |
| 80 |
+ shell_commad_list.append('--buildpkg-exclude') |
| 81 |
+ shell_commad_list.append('acct-*') |
| 82 |
aftersteps_list.append( |
| 83 |
steps.SetPropertyFromCommandNewStyle( |
| 84 |
command=shell_commad_list, |
Archives