mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
meta/classes: Various python whitespace fixes
It was pointed out we have a number of weird indentations in the python functions. This patch cleans up 3, 7 and other weird indentations for the core bbclass files. It also fixes some wierd (odd) shell function indentation which my searches picked up. (From OE-Core rev: 8385d6d74624000d68814f4e3266d47bc8885942) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
+14
-14
@@ -109,7 +109,7 @@ def package_qa_get_machine_dict():
|
||||
"linux-gnux32" : {
|
||||
"x86_64": (62, 0, 0, True, 32),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Currently not being used by default "desktop"
|
||||
@@ -719,19 +719,19 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
|
||||
|
||||
cnf = d.getVar('EXTRA_OECONF', True) or ""
|
||||
if "gettext" not in d.getVar('P', True) and "gcc-runtime" not in d.getVar('P', True) and "--disable-nls" not in cnf:
|
||||
ml = d.getVar("MLPREFIX", True) or ""
|
||||
if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
|
||||
gt = "gettext-native"
|
||||
elif bb.data.inherits_class('cross-canadian', d):
|
||||
gt = "gettext-nativesdk"
|
||||
else:
|
||||
gt = "virtual/" + ml + "gettext"
|
||||
deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "")
|
||||
if gt not in deps:
|
||||
for config in configs:
|
||||
gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
|
||||
if subprocess.call(gnu, shell=True) == 0:
|
||||
bb.fatal("""%s required but not in DEPENDS for file %s.
|
||||
ml = d.getVar("MLPREFIX", True) or ""
|
||||
if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk', d):
|
||||
gt = "gettext-native"
|
||||
elif bb.data.inherits_class('cross-canadian', d):
|
||||
gt = "gettext-nativesdk"
|
||||
else:
|
||||
gt = "virtual/" + ml + "gettext"
|
||||
deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "")
|
||||
if gt not in deps:
|
||||
for config in configs:
|
||||
gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
|
||||
if subprocess.call(gnu, shell=True) == 0:
|
||||
bb.fatal("""%s required but not in DEPENDS for file %s.
|
||||
Missing inherit gettext?""" % (gt, config))
|
||||
|
||||
if not package_qa_check_license(workdir, d):
|
||||
|
||||
Reference in New Issue
Block a user