diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-30 17:22:30 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-31 16:58:36 +0100 |
| commit | 3220a20b9862301d94118a271c8b054018541cd4 (patch) | |
| tree | d5203bc2bc5dc473785f9e7f44bf2bb7c51c0a02 | |
| parent | 6b9eb4e9f04387b68e1b55e06b0d91edfa572abb (diff) | |
| download | poky-3220a20b9862301d94118a271c8b054018541cd4.tar.gz | |
sstate: Drop intercept functions support
The only user was siteconfig which has been removed. The API was horrible
and we don't want to encourage this kind of usage.
(From OE-Core rev: cfbfd0b2e89eb71783c55a1be4a7e63e6cd82c2f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes-global/sstate.bbclass | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 76a7b59636..f4ebeb5859 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass | |||
| @@ -189,7 +189,6 @@ def sstate_state_fromvars(d, task = None): | |||
| 189 | plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs') or "").split() | 189 | plaindirs = (d.getVarFlag("do_" + task, 'sstate-plaindirs') or "").split() |
| 190 | lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile') or "").split() | 190 | lockfiles = (d.getVarFlag("do_" + task, 'sstate-lockfile') or "").split() |
| 191 | lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared') or "").split() | 191 | lockfilesshared = (d.getVarFlag("do_" + task, 'sstate-lockfile-shared') or "").split() |
| 192 | interceptfuncs = (d.getVarFlag("do_" + task, 'sstate-interceptfuncs') or "").split() | ||
| 193 | fixmedir = d.getVarFlag("do_" + task, 'sstate-fixmedir') or "" | 192 | fixmedir = d.getVarFlag("do_" + task, 'sstate-fixmedir') or "" |
| 194 | if not task or len(inputs) != len(outputs): | 193 | if not task or len(inputs) != len(outputs): |
| 195 | bb.fatal("sstate variables not setup correctly?!") | 194 | bb.fatal("sstate variables not setup correctly?!") |
| @@ -205,7 +204,6 @@ def sstate_state_fromvars(d, task = None): | |||
| 205 | ss['lockfiles'] = lockfiles | 204 | ss['lockfiles'] = lockfiles |
| 206 | ss['lockfiles-shared'] = lockfilesshared | 205 | ss['lockfiles-shared'] = lockfilesshared |
| 207 | ss['plaindirs'] = plaindirs | 206 | ss['plaindirs'] = plaindirs |
| 208 | ss['interceptfuncs'] = interceptfuncs | ||
| 209 | ss['fixmedir'] = fixmedir | 207 | ss['fixmedir'] = fixmedir |
| 210 | return ss | 208 | return ss |
| 211 | 209 | ||
| @@ -790,9 +788,6 @@ sstate_task_prefunc[dirs] = "${WORKDIR}" | |||
| 790 | python sstate_task_postfunc () { | 788 | python sstate_task_postfunc () { |
| 791 | shared_state = sstate_state_fromvars(d) | 789 | shared_state = sstate_state_fromvars(d) |
| 792 | 790 | ||
| 793 | for intercept in shared_state['interceptfuncs']: | ||
| 794 | bb.build.exec_func(intercept, d, (d.getVar("WORKDIR"),)) | ||
| 795 | |||
| 796 | omask = os.umask(0o002) | 791 | omask = os.umask(0o002) |
| 797 | if omask != 0o002: | 792 | if omask != 0o002: |
| 798 | bb.note("Using umask 0o002 (not %0o) for sstate packaging" % omask) | 793 | bb.note("Using umask 0o002 (not %0o) for sstate packaging" % omask) |
