diff options
Diffstat (limited to 'meta/classes/siteinfo.bbclass')
-rw-r--r-- | meta/classes/siteinfo.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass index 6eca004c5e..abb194f0d6 100644 --- a/meta/classes/siteinfo.bbclass +++ b/meta/classes/siteinfo.bbclass | |||
@@ -113,14 +113,14 @@ def siteinfo_data(d): | |||
113 | 113 | ||
114 | # Add in any extra user supplied data which may come from a BSP layer, removing the | 114 | # Add in any extra user supplied data which may come from a BSP layer, removing the |
115 | # need to always change this class directly | 115 | # need to always change this class directly |
116 | extra_siteinfo = (d.getVar("SITEINFO_EXTRA_DATAFUNCS", True) or "").split() | 116 | extra_siteinfo = (d.getVar("SITEINFO_EXTRA_DATAFUNCS") or "").split() |
117 | for m in extra_siteinfo: | 117 | for m in extra_siteinfo: |
118 | call = m + "(archinfo, osinfo, targetinfo, d)" | 118 | call = m + "(archinfo, osinfo, targetinfo, d)" |
119 | locs = { "archinfo" : archinfo, "osinfo" : osinfo, "targetinfo" : targetinfo, "d" : d} | 119 | locs = { "archinfo" : archinfo, "osinfo" : osinfo, "targetinfo" : targetinfo, "d" : d} |
120 | archinfo, osinfo, targetinfo = bb.utils.better_eval(call, locs) | 120 | archinfo, osinfo, targetinfo = bb.utils.better_eval(call, locs) |
121 | 121 | ||
122 | hostarch = d.getVar("HOST_ARCH", True) | 122 | hostarch = d.getVar("HOST_ARCH") |
123 | hostos = d.getVar("HOST_OS", True) | 123 | hostos = d.getVar("HOST_OS") |
124 | target = "%s-%s" % (hostarch, hostos) | 124 | target = "%s-%s" % (hostarch, hostos) |
125 | 125 | ||
126 | sitedata = [] | 126 | sitedata = [] |
@@ -144,7 +144,7 @@ python () { | |||
144 | d.setVar("SITEINFO_ENDIANNESS", "be") | 144 | d.setVar("SITEINFO_ENDIANNESS", "be") |
145 | else: | 145 | else: |
146 | bb.error("Unable to determine endianness for architecture '%s'" % | 146 | bb.error("Unable to determine endianness for architecture '%s'" % |
147 | d.getVar("HOST_ARCH", True)) | 147 | d.getVar("HOST_ARCH")) |
148 | bb.fatal("Please add your architecture to siteinfo.bbclass") | 148 | bb.fatal("Please add your architecture to siteinfo.bbclass") |
149 | 149 | ||
150 | if "bit-32" in sitedata: | 150 | if "bit-32" in sitedata: |
@@ -153,14 +153,14 @@ python () { | |||
153 | d.setVar("SITEINFO_BITS", "64") | 153 | d.setVar("SITEINFO_BITS", "64") |
154 | else: | 154 | else: |
155 | bb.error("Unable to determine bit size for architecture '%s'" % | 155 | bb.error("Unable to determine bit size for architecture '%s'" % |
156 | d.getVar("HOST_ARCH", True)) | 156 | d.getVar("HOST_ARCH")) |
157 | bb.fatal("Please add your architecture to siteinfo.bbclass") | 157 | bb.fatal("Please add your architecture to siteinfo.bbclass") |
158 | } | 158 | } |
159 | 159 | ||
160 | def siteinfo_get_files(d, aclocalcache = False): | 160 | def siteinfo_get_files(d, aclocalcache = False): |
161 | sitedata = siteinfo_data(d) | 161 | sitedata = siteinfo_data(d) |
162 | sitefiles = "" | 162 | sitefiles = "" |
163 | for path in d.getVar("BBPATH", True).split(":"): | 163 | for path in d.getVar("BBPATH").split(":"): |
164 | for element in sitedata: | 164 | for element in sitedata: |
165 | filename = os.path.join(path, "site", element) | 165 | filename = os.path.join(path, "site", element) |
166 | if os.path.exists(filename): | 166 | if os.path.exists(filename): |
@@ -177,7 +177,7 @@ def siteinfo_get_files(d, aclocalcache = False): | |||
177 | # issues and the directory being created/removed whilst this code executes. This can happen | 177 | # issues and the directory being created/removed whilst this code executes. This can happen |
178 | # when a multilib recipe is parsed along with its base variant which may be running at the time | 178 | # when a multilib recipe is parsed along with its base variant which may be running at the time |
179 | # causing rare but nasty failures | 179 | # causing rare but nasty failures |
180 | path_siteconfig = d.getVar('ACLOCALDIR', True) | 180 | path_siteconfig = d.getVar('ACLOCALDIR') |
181 | if path_siteconfig and os.path.isdir(path_siteconfig): | 181 | if path_siteconfig and os.path.isdir(path_siteconfig): |
182 | for i in os.listdir(path_siteconfig): | 182 | for i in os.listdir(path_siteconfig): |
183 | if not i.endswith("_config"): | 183 | if not i.endswith("_config"): |