diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-13 11:16:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-14 11:35:56 +0000 |
commit | dfd833725dab28015474359754883a67bbc80cc6 (patch) | |
tree | 8e662381b09eb469f0e37c6ebeb2e307e8c25e41 /meta/classes/update-alternatives.bbclass | |
parent | 7f457682544e1ca80e7f3637d8ffddd9ede8ff57 (diff) | |
download | poky-dfd833725dab28015474359754883a67bbc80cc6.tar.gz |
meta: remove True option to getVar calls (again)
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
(From OE-Core rev: 9f551d588693328e4d99d33be94f26684eafcaba)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/update-alternatives.bbclass')
-rw-r--r-- | meta/classes/update-alternatives.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 1362274d4d..f1250f877b 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass | |||
@@ -154,7 +154,7 @@ def apply_update_alternative_renames(d): | |||
154 | if not alt_link: | 154 | if not alt_link: |
155 | alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) | 155 | alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) |
156 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) | 156 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) |
157 | if alt_link.startswith(os.path.join(d.getVar('sysconfdir', True), 'init.d')): | 157 | if alt_link.startswith(os.path.join(d.getVar('sysconfdir'), 'init.d')): |
158 | # Managing init scripts does not work (bug #10433), foremost | 158 | # Managing init scripts does not work (bug #10433), foremost |
159 | # because of a race with update-rc.d | 159 | # because of a race with update-rc.d |
160 | bb.fatal("Using update-alternatives for managing SysV init scripts is not supported") | 160 | bb.fatal("Using update-alternatives for managing SysV init scripts is not supported") |