diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-core/meta | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/meta')
-rw-r--r-- | meta/recipes-core/meta/meta-environment-extsdk.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 6 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-extsdk-toolchain.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-world-pkgdata.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/signing-keys.bb | 18 |
5 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb index d9e596143f..52012cc4fb 100644 --- a/meta/recipes-core/meta/meta-environment-extsdk.bb +++ b/meta/recipes-core/meta/meta-environment-extsdk.bb | |||
@@ -5,8 +5,8 @@ require meta-environment.bb | |||
5 | PN = "meta-environment-extsdk-${MACHINE}" | 5 | PN = "meta-environment-extsdk-${MACHINE}" |
6 | 6 | ||
7 | create_sdk_files_append() { | 7 | create_sdk_files_append() { |
8 | local sysroot=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET', True), d.getVar('TOPDIR', True))} | 8 | local sysroot=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_TARGET'), d.getVar('TOPDIR'))} |
9 | local sdkpathnative=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE',True), d.getVar('TOPDIR', True))} | 9 | local sdkpathnative=${SDKPATH}/${@os.path.relpath(d.getVar('STAGING_DIR_NATIVE',True), d.getVar('TOPDIR'))} |
10 | 10 | ||
11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative | 11 | toolchain_create_sdk_env_script '' '' $sysroot '' ${bindir_native} ${prefix_native} $sdkpathnative |
12 | } | 12 | } |
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 71e0c23186..a250cc89fe 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb | |||
@@ -26,16 +26,16 @@ python do_generate_content() { | |||
26 | localdata = bb.data.createCopy(d) | 26 | localdata = bb.data.createCopy(d) |
27 | 27 | ||
28 | # make sure we only use the WORKDIR value from 'd', or it can change | 28 | # make sure we only use the WORKDIR value from 'd', or it can change |
29 | localdata.setVar('WORKDIR', d.getVar('WORKDIR', True)) | 29 | localdata.setVar('WORKDIR', d.getVar('WORKDIR')) |
30 | 30 | ||
31 | # make sure we only use the SDKTARGETSYSROOT value from 'd' | 31 | # make sure we only use the SDKTARGETSYSROOT value from 'd' |
32 | localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT', True)) | 32 | localdata.setVar('SDKTARGETSYSROOT', d.getVar('SDKTARGETSYSROOT')) |
33 | localdata.setVar('libdir', d.getVar('target_libdir', False)) | 33 | localdata.setVar('libdir', d.getVar('target_libdir', False)) |
34 | 34 | ||
35 | # Process DEFAULTTUNE | 35 | # Process DEFAULTTUNE |
36 | bb.build.exec_func("create_sdk_files", localdata) | 36 | bb.build.exec_func("create_sdk_files", localdata) |
37 | 37 | ||
38 | variants = d.getVar("MULTILIB_VARIANTS", True) or "" | 38 | variants = d.getVar("MULTILIB_VARIANTS") or "" |
39 | for item in variants.split(): | 39 | for item in variants.split(): |
40 | # Load overrides from 'd' to avoid having to reset the value... | 40 | # Load overrides from 'd' to avoid having to reset the value... |
41 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item | 41 | overrides = d.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item |
diff --git a/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/meta/recipes-core/meta/meta-extsdk-toolchain.bb index 22de0f357b..fc6d6de99a 100644 --- a/meta/recipes-core/meta/meta-extsdk-toolchain.bb +++ b/meta/recipes-core/meta/meta-extsdk-toolchain.bb | |||
@@ -19,7 +19,7 @@ do_locked_sigs[sstate-outputdirs] = "${STAGING_DIR_HOST}/locked-sigs" | |||
19 | 19 | ||
20 | python do_locked_sigs() { | 20 | python do_locked_sigs() { |
21 | import oe.copy_buildsystem | 21 | import oe.copy_buildsystem |
22 | outdir = os.path.join(d.getVar('LOCKED_SIGS_INDIR', True)) | 22 | outdir = os.path.join(d.getVar('LOCKED_SIGS_INDIR')) |
23 | bb.utils.mkdirhier(outdir) | 23 | bb.utils.mkdirhier(outdir) |
24 | sigfile = os.path.join(outdir, 'locked-sigs-extsdk-toolchain.inc') | 24 | sigfile = os.path.join(outdir, 'locked-sigs-extsdk-toolchain.inc') |
25 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) | 25 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) |
diff --git a/meta/recipes-core/meta/meta-world-pkgdata.bb b/meta/recipes-core/meta/meta-world-pkgdata.bb index 81c8647fa6..0ce378ea2b 100644 --- a/meta/recipes-core/meta/meta-world-pkgdata.bb +++ b/meta/recipes-core/meta/meta-world-pkgdata.bb | |||
@@ -19,7 +19,7 @@ do_collect_packagedata[sstate-outputdirs] = "${STAGING_DIR_HOST}/world-pkgdata" | |||
19 | 19 | ||
20 | python do_collect_packagedata() { | 20 | python do_collect_packagedata() { |
21 | import oe.copy_buildsystem | 21 | import oe.copy_buildsystem |
22 | outdir = os.path.join(d.getVar('WORLD_PKGDATADIR', True)) | 22 | outdir = os.path.join(d.getVar('WORLD_PKGDATADIR')) |
23 | bb.utils.mkdirhier(outdir) | 23 | bb.utils.mkdirhier(outdir) |
24 | sigfile = os.path.join(outdir, 'locked-sigs-pkgdata.inc') | 24 | sigfile = os.path.join(outdir, 'locked-sigs-pkgdata.inc') |
25 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) | 25 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) |
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb index d088c0c88c..aaa01d0c34 100644 --- a/meta/recipes-core/meta/signing-keys.bb +++ b/meta/recipes-core/meta/signing-keys.bb | |||
@@ -21,23 +21,23 @@ FILES_${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" | |||
21 | python do_get_public_keys () { | 21 | python do_get_public_keys () { |
22 | from oe.gpg_sign import get_signer | 22 | from oe.gpg_sign import get_signer |
23 | 23 | ||
24 | if d.getVar("RPM_SIGN_PACKAGES", True): | 24 | if d.getVar("RPM_SIGN_PACKAGES"): |
25 | # Export public key of the rpm signing key | 25 | # Export public key of the rpm signing key |
26 | signer = get_signer(d, d.getVar('RPM_GPG_BACKEND', True)) | 26 | signer = get_signer(d, d.getVar('RPM_GPG_BACKEND')) |
27 | signer.export_pubkey(os.path.join(d.expand('${B}'), 'rpm-key'), | 27 | signer.export_pubkey(os.path.join(d.expand('${B}'), 'rpm-key'), |
28 | d.getVar('RPM_GPG_NAME', True)) | 28 | d.getVar('RPM_GPG_NAME')) |
29 | 29 | ||
30 | if d.getVar("IPK_SIGN_PACKAGES", True): | 30 | if d.getVar("IPK_SIGN_PACKAGES"): |
31 | # Export public key of the ipk signing key | 31 | # Export public key of the ipk signing key |
32 | signer = get_signer(d, d.getVar('IPK_GPG_BACKEND', True)) | 32 | signer = get_signer(d, d.getVar('IPK_GPG_BACKEND')) |
33 | signer.export_pubkey(os.path.join(d.expand('${B}'), 'ipk-key'), | 33 | signer.export_pubkey(os.path.join(d.expand('${B}'), 'ipk-key'), |
34 | d.getVar('IPK_GPG_NAME', True)) | 34 | d.getVar('IPK_GPG_NAME')) |
35 | 35 | ||
36 | if d.getVar('PACKAGE_FEED_SIGN', True) == '1': | 36 | if d.getVar('PACKAGE_FEED_SIGN') == '1': |
37 | # Export public key of the feed signing key | 37 | # Export public key of the feed signing key |
38 | signer = get_signer(d, d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) | 38 | signer = get_signer(d, d.getVar('PACKAGE_FEED_GPG_BACKEND')) |
39 | signer.export_pubkey(os.path.join(d.expand('${B}'), 'pf-key'), | 39 | signer.export_pubkey(os.path.join(d.expand('${B}'), 'pf-key'), |
40 | d.getVar('PACKAGE_FEED_GPG_NAME', True)) | 40 | d.getVar('PACKAGE_FEED_GPG_NAME')) |
41 | } | 41 | } |
42 | do_get_public_keys[cleandirs] = "${B}" | 42 | do_get_public_keys[cleandirs] = "${B}" |
43 | addtask get_public_keys before do_install | 43 | addtask get_public_keys before do_install |