diff options
-rw-r--r-- | meta/classes/crosssdk.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/license.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/linux-kernel-base.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/siteconfig.bbclass | 18 |
4 files changed, 14 insertions, 14 deletions
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass index 03b0c602c3..fdaaac8481 100644 --- a/meta/classes/crosssdk.bbclass +++ b/meta/classes/crosssdk.bbclass | |||
@@ -4,8 +4,8 @@ CLASSOVERRIDE = "class-crosssdk" | |||
4 | MACHINEOVERRIDES = "" | 4 | MACHINEOVERRIDES = "" |
5 | PACKAGE_ARCH = "${SDK_ARCH}" | 5 | PACKAGE_ARCH = "${SDK_ARCH}" |
6 | python () { | 6 | python () { |
7 | # set TUNE_PKGARCH to SDK_ARCH | 7 | # set TUNE_PKGARCH to SDK_ARCH |
8 | d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) | 8 | d.setVar('TUNE_PKGARCH', d.getVar('SDK_ARCH')) |
9 | } | 9 | } |
10 | 10 | ||
11 | STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" | 11 | STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}" |
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 0e5675c500..ed91a4b4db 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -309,7 +309,7 @@ def incompatible_license(d, dont_want_licenses, package=None): | |||
309 | except oe.license.LicenseError as exc: | 309 | except oe.license.LicenseError as exc: |
310 | bb.fatal('%s: %s' % (d.getVar('P'), exc)) | 310 | bb.fatal('%s: %s' % (d.getVar('P'), exc)) |
311 | return any(not oe.license.license_ok(canonical_license(d, l), \ | 311 | return any(not oe.license.license_ok(canonical_license(d, l), \ |
312 | dont_want_licenses) for l in licenses) | 312 | dont_want_licenses) for l in licenses) |
313 | 313 | ||
314 | def check_license_flags(d): | 314 | def check_license_flags(d): |
315 | """ | 315 | """ |
diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass index 89ce71605c..ba59222c24 100644 --- a/meta/classes/linux-kernel-base.bbclass +++ b/meta/classes/linux-kernel-base.bbclass | |||
@@ -34,8 +34,8 @@ def get_kernelversion_file(p): | |||
34 | return None | 34 | return None |
35 | 35 | ||
36 | def linux_module_packages(s, d): | 36 | def linux_module_packages(s, d): |
37 | suffix = "" | 37 | suffix = "" |
38 | return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) | 38 | return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) |
39 | 39 | ||
40 | # that's all | 40 | # that's all |
41 | 41 | ||
diff --git a/meta/classes/siteconfig.bbclass b/meta/classes/siteconfig.bbclass index bb491d2994..0cfa5a6834 100644 --- a/meta/classes/siteconfig.bbclass +++ b/meta/classes/siteconfig.bbclass | |||
@@ -1,13 +1,13 @@ | |||
1 | python siteconfig_do_siteconfig () { | 1 | python siteconfig_do_siteconfig () { |
2 | shared_state = sstate_state_fromvars(d) | 2 | shared_state = sstate_state_fromvars(d) |
3 | if shared_state['task'] != 'populate_sysroot': | 3 | if shared_state['task'] != 'populate_sysroot': |
4 | return | 4 | return |
5 | if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME'), 'site_config')): | 5 | if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME'), 'site_config')): |
6 | bb.debug(1, "No site_config directory, skipping do_siteconfig") | 6 | bb.debug(1, "No site_config directory, skipping do_siteconfig") |
7 | return | 7 | return |
8 | sstate_install(shared_state, d) | 8 | sstate_install(shared_state, d) |
9 | bb.build.exec_func('do_siteconfig_gencache', d) | 9 | bb.build.exec_func('do_siteconfig_gencache', d) |
10 | sstate_clean(shared_state, d) | 10 | sstate_clean(shared_state, d) |
11 | } | 11 | } |
12 | 12 | ||
13 | EXTRASITECONFIG ?= "" | 13 | EXTRASITECONFIG ?= "" |