diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-04 12:00:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-05 17:32:50 +0100 |
commit | bb1940a0d65660a967b1f126ce3cbd89314d1e3b (patch) | |
tree | d10218e4fb566cf077c19d5d5f3316fb266fdd2d | |
parent | 996d1f4518f6d96406fb1d1849e368a3832610c1 (diff) | |
download | poky-bb1940a0d65660a967b1f126ce3cbd89314d1e3b.tar.gz |
base/pixbufcache: Remove obsolete sstatecompletions code
This has been unused in OE-Core since the introduction of recipe specific
sysroots. Its not so useful since it only runs once upon sstate installation,
not per installation per sysroot.
Remove the weird looking comment left behind in pixbufcache too.
(From OE-Core rev: 2af49716504f65be0cb01f609ea9bfa334926589)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/base.bbclass | 14 | ||||
-rw-r--r-- | meta/classes/pixbufcache.bbclass | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d0b82d747d..1636c6ef93 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -220,7 +220,7 @@ def buildcfg_neededvars(d): | |||
220 | bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) | 220 | bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) |
221 | 221 | ||
222 | addhandler base_eventhandler | 222 | addhandler base_eventhandler |
223 | base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.MultiConfigParsed bb.event.BuildStarted bb.event.RecipePreFinalise bb.runqueue.sceneQueueComplete bb.event.RecipeParsed" | 223 | base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.MultiConfigParsed bb.event.BuildStarted bb.event.RecipePreFinalise bb.event.RecipeParsed" |
224 | python base_eventhandler() { | 224 | python base_eventhandler() { |
225 | import bb.runqueue | 225 | import bb.runqueue |
226 | 226 | ||
@@ -274,18 +274,6 @@ python base_eventhandler() { | |||
274 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++") | 274 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++") |
275 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs") | 275 | d.delVar("PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs") |
276 | 276 | ||
277 | if isinstance(e, bb.runqueue.sceneQueueComplete): | ||
278 | completions = d.expand("${STAGING_DIR}/sstatecompletions") | ||
279 | if os.path.exists(completions): | ||
280 | cmds = set() | ||
281 | with open(completions, "r") as f: | ||
282 | cmds = set(f) | ||
283 | d.setVar("completion_function", "\n".join(cmds)) | ||
284 | d.setVarFlag("completion_function", "func", "1") | ||
285 | bb.debug(1, "Executing SceneQueue Completion commands: %s" % "\n".join(cmds)) | ||
286 | bb.build.exec_func("completion_function", d) | ||
287 | os.remove(completions) | ||
288 | |||
289 | if isinstance(e, bb.event.RecipeParsed): | 277 | if isinstance(e, bb.event.RecipeParsed): |
290 | # | 278 | # |
291 | # If we have multiple providers of virtual/X and a PREFERRED_PROVIDER_virtual/X is set | 279 | # If we have multiple providers of virtual/X and a PREFERRED_PROVIDER_virtual/X is set |
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index fb50cd4965..b07f51ed56 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass | |||
@@ -54,7 +54,6 @@ GDK_PIXBUF_FATAL_LOADER=1 ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-que | |||
54 | DEPENDS_append_class-native = " gdk-pixbuf-native" | 54 | DEPENDS_append_class-native = " gdk-pixbuf-native" |
55 | SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst" | 55 | SYSROOT_PREPROCESS_FUNCS_append_class-native = " pixbufcache_sstate_postinst" |
56 | 56 | ||
57 | # See base.bbclass for the other half of this | ||
58 | pixbufcache_sstate_postinst() { | 57 | pixbufcache_sstate_postinst() { |
59 | mkdir -p ${SYSROOT_DESTDIR}${bindir} | 58 | mkdir -p ${SYSROOT_DESTDIR}${bindir} |
60 | dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN} | 59 | dest=${SYSROOT_DESTDIR}${bindir}/postinst-${PN} |