diff options
Diffstat (limited to 'meta/classes/insane.bbclass')
-rw-r--r-- | meta/classes/insane.bbclass | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 556a17684f..0f3f1cd082 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -109,7 +109,7 @@ def package_qa_get_machine_dict(): | |||
109 | "linux-gnux32" : { | 109 | "linux-gnux32" : { |
110 | "x86_64": (62, 0, 0, True, 32), | 110 | "x86_64": (62, 0, 0, True, 32), |
111 | }, | 111 | }, |
112 | } | 112 | } |
113 | 113 | ||
114 | 114 | ||
115 | # Currently not being used by default "desktop" | 115 | # Currently not being used by default "desktop" |
@@ -719,19 +719,19 @@ Rerun configure task after fixing this. The path was '%s'""" % root) | |||
719 | 719 | ||
720 | cnf = d.getVar('EXTRA_OECONF', True) or "" | 720 | cnf = d.getVar('EXTRA_OECONF', True) or "" |
721 | if "gettext" not in d.getVar('P', True) and "gcc-runtime" not in d.getVar('P', True) and "--disable-nls" not in cnf: | 721 | if "gettext" not in d.getVar('P', True) and "gcc-runtime" not in d.getVar('P', True) and "--disable-nls" not in cnf: |
722 | ml = d.getVar("MLPREFIX", True) or "" | 722 | ml = d.getVar("MLPREFIX", True) or "" |
723 | 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): | 723 | 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): |
724 | gt = "gettext-native" | 724 | gt = "gettext-native" |
725 | elif bb.data.inherits_class('cross-canadian', d): | 725 | elif bb.data.inherits_class('cross-canadian', d): |
726 | gt = "gettext-nativesdk" | 726 | gt = "gettext-nativesdk" |
727 | else: | 727 | else: |
728 | gt = "virtual/" + ml + "gettext" | 728 | gt = "virtual/" + ml + "gettext" |
729 | deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "") | 729 | deps = bb.utils.explode_deps(d.getVar('DEPENDS', True) or "") |
730 | if gt not in deps: | 730 | if gt not in deps: |
731 | for config in configs: | 731 | for config in configs: |
732 | gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config | 732 | gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config |
733 | if subprocess.call(gnu, shell=True) == 0: | 733 | if subprocess.call(gnu, shell=True) == 0: |
734 | bb.fatal("""%s required but not in DEPENDS for file %s. | 734 | bb.fatal("""%s required but not in DEPENDS for file %s. |
735 | Missing inherit gettext?""" % (gt, config)) | 735 | Missing inherit gettext?""" % (gt, config)) |
736 | 736 | ||
737 | if not package_qa_check_license(workdir, d): | 737 | if not package_qa_check_license(workdir, d): |