MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

meta/lib: move buildstats.py and rootfspostcommands.py into oe

Browse Source 
These two files are the only ones that are left in meta/lib.
They logically belong to meta/lib/oe, so move them there.

(From OE-Core rev: c65dd0e3e463d6072b9364ac74e1fef0d998068f)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi 2024-12-03 12:53:09 +08:00 committed by Richard Purdie
parent 8c17606068
commit f4c4aa37fc
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes-global/buildstats.bbclass
View File

@ -276,7 +276,7 @@ addhandler run_buildstats
run_buildstats[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.event.HeartbeatEvent bb.build.TaskStarted bb.build.TaskSucceeded bb.build.TaskFailed"
python runqueue_stats () {
import buildstats
import oe.buildstats
from bb import event, runqueue
# We should not record any samples before the first task has started,
# because that's the first activity shown in the process chart.
@ -286,7 +286,7 @@ python runqueue_stats () {
# closed when the build is done.
system_stats = d.getVar('_buildstats_system_stats', False)
if not system_stats and isinstance(e, (bb.runqueue.sceneQueueTaskStarted, bb.runqueue.runQueueTaskStarted)):
system_stats = buildstats.SystemStats(d)
system_stats = oe.buildstats.SystemStats(d)
d.setVar('_buildstats_system_stats', system_stats)
if system_stats:
# Ensure that we sample at important events.

8
meta/classes-recipe/rootfs-postcommands.bbclass
View File

@ -308,19 +308,19 @@ serial_autologin_root () {
}
python tidy_shadowutils_files () {
import rootfspostcommands
rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}'))
import oe.rootfspostcommands
oe.rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}'))
}
python sort_passwd () {
"""
Deprecated in the favour of tidy_shadowutils_files.
"""
import rootfspostcommands
import oe.rootfspostcommands
bb.warn('[sort_passwd] You are using a deprecated function for '
'SORT_PASSWD_POSTPROCESS_COMMAND. The default one is now called '
'"tidy_shadowutils_files".')
rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}'))
oe.rootfspostcommands.tidy_shadowutils_files(d.expand('${IMAGE_ROOTFS}${sysconfdir}'))
}
#

0
meta/lib/buildstats.py → meta/lib/oe/buildstats.py
View File

0
meta/lib/rootfspostcommands.py → meta/lib/oe/rootfspostcommands.py
View File