diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-13 11:16:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 16:38:31 +0000 |
commit | afadb9aa510f5ba4809fc43e3987ef30f94495aa (patch) | |
tree | a04dacc73d8f726a3c5de32bc4da968d5aa665a2 /meta/classes/update-alternatives.bbclass | |
parent | 46d75fd3db307c9058d80bdc8efe38087dc556ed (diff) | |
download | poky-afadb9aa510f5ba4809fc43e3987ef30f94495aa.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)
(From OE-Core rev: 2da88ecbbf118bb7440f48184d4b39c273ab57e9)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.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 aa01058cf9..a7f1a6fda6 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass | |||
@@ -143,7 +143,7 @@ python perform_packagecopy_append () { | |||
143 | if not alt_link: | 143 | if not alt_link: |
144 | alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) | 144 | alt_link = "%s/%s" % (d.getVar('bindir'), alt_name) |
145 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) | 145 | d.setVarFlag('ALTERNATIVE_LINK_NAME', alt_name, alt_link) |
146 | if alt_link.startswith(os.path.join(d.getVar('sysconfdir', True), 'init.d')): | 146 | if alt_link.startswith(os.path.join(d.getVar('sysconfdir'), 'init.d')): |
147 | # Managing init scripts does not work (bug #10433), foremost | 147 | # Managing init scripts does not work (bug #10433), foremost |
148 | # because of a race with update-rc.d | 148 | # because of a race with update-rc.d |
149 | bb.fatal("Using update-alternatives for managing SysV init scripts is not supported") | 149 | bb.fatal("Using update-alternatives for managing SysV init scripts is not supported") |