diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /scripts/lib/devtool/upgrade.py | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/upgrade.py')
-rw-r--r-- | scripts/lib/devtool/upgrade.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index da1456a01a..63362b4900 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py | |||
@@ -103,14 +103,14 @@ def _write_append(rc, srctree, same_dir, no_same_dir, rev, copied, workspace, d) | |||
103 | pn = d.getVar('PN') | 103 | pn = d.getVar('PN') |
104 | af = os.path.join(appendpath, '%s.bbappend' % brf) | 104 | af = os.path.join(appendpath, '%s.bbappend' % brf) |
105 | with open(af, 'w') as f: | 105 | with open(af, 'w') as f: |
106 | f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n\n') | 106 | f.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n\n') |
107 | f.write('inherit externalsrc\n') | 107 | f.write('inherit externalsrc\n') |
108 | f.write(('# NOTE: We use pn- overrides here to avoid affecting' | 108 | f.write(('# NOTE: We use pn- overrides here to avoid affecting' |
109 | 'multiple variants in the case where the recipe uses BBCLASSEXTEND\n')) | 109 | 'multiple variants in the case where the recipe uses BBCLASSEXTEND\n')) |
110 | f.write('EXTERNALSRC_pn-%s = "%s"\n' % (pn, srctree)) | 110 | f.write('EXTERNALSRC:pn-%s = "%s"\n' % (pn, srctree)) |
111 | b_is_s = use_external_build(same_dir, no_same_dir, d) | 111 | b_is_s = use_external_build(same_dir, no_same_dir, d) |
112 | if b_is_s: | 112 | if b_is_s: |
113 | f.write('EXTERNALSRC_BUILD_pn-%s = "%s"\n' % (pn, srctree)) | 113 | f.write('EXTERNALSRC_BUILD:pn-%s = "%s"\n' % (pn, srctree)) |
114 | f.write('\n') | 114 | f.write('\n') |
115 | if rev: | 115 | if rev: |
116 | f.write('# initial_rev: %s\n' % rev) | 116 | f.write('# initial_rev: %s\n' % rev) |