mirror of
https://git.yoctoproject.org/poky
synced 2026-06-04 02:00:04 +00:00
classes/lib: Complete transition to python3
This patch contains all the other misc pieces of the transition to python3 which didn't make sense to be broken into individual patches. (From OE-Core rev: fcd6b38bab8517d83e1ed48eef1bca9a9a190f57) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -10,7 +10,7 @@ inherit utility-tasks
|
||||
inherit metadata_scm
|
||||
inherit logging
|
||||
|
||||
OE_IMPORTS += "os sys time oe.path oe.utils oe.data oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath"
|
||||
OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath"
|
||||
OE_IMPORTS[type] = "list"
|
||||
|
||||
def oe_import(d):
|
||||
|
||||
@@ -145,7 +145,7 @@ python buildhistory_emit_pkghistory() {
|
||||
elif name == "RCONFLICTS":
|
||||
pkginfo.rconflicts = value
|
||||
elif name == "PKGSIZE":
|
||||
pkginfo.size = long(value)
|
||||
pkginfo.size = int(value)
|
||||
elif name == "FILES":
|
||||
pkginfo.files = value
|
||||
elif name == "FILELIST":
|
||||
|
||||
@@ -129,8 +129,8 @@ python copy_buildsystem () {
|
||||
d.setVar('scriptrelpath', scriptrelpath)
|
||||
|
||||
# Write out config file for devtool
|
||||
import ConfigParser
|
||||
config = ConfigParser.SafeConfigParser()
|
||||
import configparser
|
||||
config = configparser.SafeConfigParser()
|
||||
config.add_section('General')
|
||||
config.set('General', 'bitbake_subdir', conf_bbpath)
|
||||
config.set('General', 'init_path', conf_initpath)
|
||||
|
||||
@@ -43,7 +43,7 @@ python errorreport_handler () {
|
||||
data['target_sys'] = e.data.getVar("TARGET_SYS", True)
|
||||
data['failures'] = []
|
||||
data['component'] = e.getPkgs()[0]
|
||||
data['branch_commit'] = base_detect_branch(e.data) + ": " + base_detect_revision(e.data)
|
||||
data['branch_commit'] = str(base_detect_branch(e.data)) + ": " + str(base_detect_revision(e.data))
|
||||
lock = bb.utils.lockfile(datafile + '.lock')
|
||||
errorreport_savedata(e, data, "error-report.txt")
|
||||
bb.utils.unlockfile(lock)
|
||||
|
||||
Reference in New Issue
Block a user