summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/allarch.bbclass2
-rw-r--r--meta/classes/archiver.bbclass2
-rw-r--r--meta/classes/buildhistory.bbclass2
-rw-r--r--meta/classes/chrpath.bbclass4
-rw-r--r--meta/classes/crosssdk.bbclass2
-rw-r--r--meta/classes/module-base.bbclass2
-rw-r--r--meta/classes/package.bbclass4
-rw-r--r--meta/classes/package_deb.bbclass2
-rw-r--r--meta/classes/siteinfo.bbclass2
-rw-r--r--meta/classes/spdx.bbclass2
-rw-r--r--meta/classes/tinderclient.bbclass2
-rw-r--r--meta/classes/update-alternatives.bbclass2
12 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index 2fea7c04df..3826643ef6 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -1,5 +1,5 @@
1# 1#
2# This class is used for architecture independent recipes/data files (usally scripts) 2# This class is used for architecture independent recipes/data files (usually scripts)
3# 3#
4 4
5# Expand STAGING_DIR_HOST since for cross-canadian/native/nativesdk, this will 5# Expand STAGING_DIR_HOST since for cross-canadian/native/nativesdk, this will
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 328e2ed11a..b95176bb9a 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -254,7 +254,7 @@ python do_unpack_and_patch() {
254 ar_outdir = d.getVar('ARCHIVER_OUTDIR', True) 254 ar_outdir = d.getVar('ARCHIVER_OUTDIR', True)
255 d.setVar('WORKDIR', ar_outdir) 255 d.setVar('WORKDIR', ar_outdir)
256 256
257 # The changed 'WORKDIR' also casued 'B' changed, create dir 'B' for the 257 # The changed 'WORKDIR' also caused 'B' changed, create dir 'B' for the
258 # possibly requiring of the following tasks (such as some recipes's 258 # possibly requiring of the following tasks (such as some recipes's
259 # do_patch required 'B' existed). 259 # do_patch required 'B' existed).
260 bb.utils.mkdirhier(d.getVar('B', True)) 260 bb.utils.mkdirhier(d.getVar('B', True))
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index a8653f9fd7..729dcd449d 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -24,7 +24,7 @@ sstate_install[vardepsexclude] += "buildhistory_emit_pkghistory"
24SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory" 24SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory"
25 25
26# 26#
27# Write out metadata about this package for comparision when writing future packages 27# Write out metadata about this package for comparison when writing future packages
28# 28#
29python buildhistory_emit_pkghistory() { 29python buildhistory_emit_pkghistory() {
30 if not d.getVar('BB_CURRENTTASK', True) in ['packagedata', 'packagedata_setscene']: 30 if not d.getVar('BB_CURRENTTASK', True) in ['packagedata', 'packagedata_setscene']:
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index e9160af6b4..9c68855ab2 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -6,7 +6,7 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d):
6 6
7 p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) 7 p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE)
8 err, out = p.communicate() 8 err, out = p.communicate()
9 # If returned succesfully, process stderr for results 9 # If returned successfully, process stderr for results
10 if p.returncode != 0: 10 if p.returncode != 0:
11 return 11 return
12 12
@@ -45,7 +45,7 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d):
45 45
46 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE) 46 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', fpath],stdout=sub.PIPE,stderr=sub.PIPE)
47 err, out = p.communicate() 47 err, out = p.communicate()
48 # If returned succesfully, process stderr for results 48 # If returned successfully, process stderr for results
49 if p.returncode != 0: 49 if p.returncode != 0:
50 return 50 return
51 for l in err.split("\n"): 51 for l in err.split("\n"):
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index 87d5cf5d37..7315c38f13 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -30,7 +30,7 @@ baselib = "lib"
30do_populate_sysroot[stamp-extra-info] = "" 30do_populate_sysroot[stamp-extra-info] = ""
31do_packagedata[stamp-extra-info] = "" 31do_packagedata[stamp-extra-info] = ""
32 32
33# Need to force this to ensure consitency accross architectures 33# Need to force this to ensure consitency across architectures
34EXTRA_OECONF_GCC_FLOAT = "" 34EXTRA_OECONF_GCC_FLOAT = ""
35 35
36USE_NLS = "no" 36USE_NLS = "no"
diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
index cf4b02ee02..6fe77c01b7 100644
--- a/meta/classes/module-base.bbclass
+++ b/meta/classes/module-base.bbclass
@@ -19,7 +19,7 @@ KERNEL_OBJECT_SUFFIX = ".ko"
19PACKAGE_ARCH = "${MACHINE_ARCH}" 19PACKAGE_ARCH = "${MACHINE_ARCH}"
20 20
21# Function to ensure the kernel scripts are created. Expected to 21# Function to ensure the kernel scripts are created. Expected to
22# be called before do_compile. See module.bbclass for an exmaple. 22# be called before do_compile. See module.bbclass for an example.
23do_make_scripts() { 23do_make_scripts() {
24 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 24 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
25 make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ 25 make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a86b680167..2bae34189d 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1513,7 +1513,7 @@ python package_do_shlibs() {
1513 rpath = [] 1513 rpath = []
1514 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-l', file],stdout=sub.PIPE,stderr=sub.PIPE) 1514 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-l', file],stdout=sub.PIPE,stderr=sub.PIPE)
1515 err, out = p.communicate() 1515 err, out = p.communicate()
1516 # If returned succesfully, process stderr for results 1516 # If returned successfully, process stderr for results
1517 if p.returncode == 0: 1517 if p.returncode == 0:
1518 for l in err.split("\n"): 1518 for l in err.split("\n"):
1519 l = l.strip() 1519 l = l.strip()
@@ -1522,7 +1522,7 @@ python package_do_shlibs() {
1522 1522
1523 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', file],stdout=sub.PIPE,stderr=sub.PIPE) 1523 p = sub.Popen([d.expand("${HOST_PREFIX}otool"), '-L', file],stdout=sub.PIPE,stderr=sub.PIPE)
1524 err, out = p.communicate() 1524 err, out = p.communicate()
1525 # If returned succesfully, process stderr for results 1525 # If returned successfully, process stderr for results
1526 if p.returncode == 0: 1526 if p.returncode == 0:
1527 for l in err.split("\n"): 1527 for l in err.split("\n"):
1528 l = l.strip() 1528 l = l.strip()
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index d2fea4fcc2..5feeeb0ecc 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -21,7 +21,7 @@ APT_ARGS = "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS", Tr
21# INSTALL_BASEARCH_DEB - install base architecutre 21# INSTALL_BASEARCH_DEB - install base architecutre
22# INSTALL_ARCHS_DEB - list of available archs 22# INSTALL_ARCHS_DEB - list of available archs
23# INSTALL_PACKAGES_NORMAL_DEB - packages to be installed 23# INSTALL_PACKAGES_NORMAL_DEB - packages to be installed
24# INSTALL_PACKAGES_ATTEMPTONLY_DEB - packages attemped to be installed only 24# INSTALL_PACKAGES_ATTEMPTONLY_DEB - packages attempted to be installed only
25# INSTALL_PACKAGES_LINGUAS_DEB - additional packages for uclibc 25# INSTALL_PACKAGES_LINGUAS_DEB - additional packages for uclibc
26# INSTALL_TASK_DEB - task name 26# INSTALL_TASK_DEB - task name
27 27
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 9f6eac4e1e..b715b6ca39 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -8,7 +8,7 @@
8# 8#
9# 'what' can be one of 9# 'what' can be one of
10# * target: Returns the target name ("<arch>-<os>") 10# * target: Returns the target name ("<arch>-<os>")
11# * endianess: Return "be" for big endian targets, "le" for little endian 11# * endianness: Return "be" for big endian targets, "le" for little endian
12# * bits: Returns the bit size of the target, either "32" or "64" 12# * bits: Returns the bit size of the target, either "32" or "64"
13# * libc: Returns the name of the c library used by the target 13# * libc: Returns the name of the c library used by the target
14# 14#
diff --git a/meta/classes/spdx.bbclass b/meta/classes/spdx.bbclass
index 454c53e96f..0c9276584c 100644
--- a/meta/classes/spdx.bbclass
+++ b/meta/classes/spdx.bbclass
@@ -232,7 +232,7 @@ def run_fossology(foss_command, full_spdx):
232 # Package info 232 # Package info
233 package_info = {} 233 package_info = {}
234 if full_spdx: 234 if full_spdx:
235 # All mandatory, only one occurance 235 # All mandatory, only one occurrence
236 package_info['PackageCopyrightText'] = re.findall('PackageCopyrightText: (.*?</text>)', foss_output, re.S)[0] 236 package_info['PackageCopyrightText'] = re.findall('PackageCopyrightText: (.*?</text>)', foss_output, re.S)[0]
237 package_info['PackageLicenseDeclared'] = re.findall('PackageLicenseDeclared: (.*)', foss_output)[0] 237 package_info['PackageLicenseDeclared'] = re.findall('PackageLicenseDeclared: (.*)', foss_output)[0]
238 package_info['PackageLicenseConcluded'] = re.findall('PackageLicenseConcluded: (.*)', foss_output)[0] 238 package_info['PackageLicenseConcluded'] = re.findall('PackageLicenseConcluded: (.*)', foss_output)[0]
diff --git a/meta/classes/tinderclient.bbclass b/meta/classes/tinderclient.bbclass
index 6984efd1be..2bc75fc65e 100644
--- a/meta/classes/tinderclient.bbclass
+++ b/meta/classes/tinderclient.bbclass
@@ -142,7 +142,7 @@ def tinder_send_http(d, status, _log):
142 142
143 selector = url + "/xml/build_status.pl" 143 selector = url + "/xml/build_status.pl"
144 144
145 # now post it - in chunks of 10.000 charachters 145 # now post it - in chunks of 10.000 characters
146 new_log = _log 146 new_log = _log
147 while len(new_log) > 0: 147 while len(new_log) > 0:
148 content_type, body = tinder_format_http_post(d,status,new_log[0:18000]) 148 content_type, body = tinder_format_http_post(d,status,new_log[0:18000])
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index a3c1657fa9..825cc88043 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -61,7 +61,7 @@
61ALTERNATIVE_PRIORITY = "10" 61ALTERNATIVE_PRIORITY = "10"
62 62
63# We need special processing for vardeps because it can not work on 63# We need special processing for vardeps because it can not work on
64# modified flag values. So we agregate the flags into a new variable 64# modified flag values. So we aggregate the flags into a new variable
65# and include that vairable in the set. 65# and include that vairable in the set.
66UPDALTVARS = "ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY" 66UPDALTVARS = "ALTERNATIVE ALTERNATIVE_LINK_NAME ALTERNATIVE_TARGET ALTERNATIVE_PRIORITY"
67 67