summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-02-01 16:50:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-15 21:46:56 +0000
commit54d0147307e0fb581db20603cfec58d74343a0de (patch)
tree0924d0197faf85851987995fe249615d0ee28e16 /meta/lib
parentf8183e4c6f63ac34ab17262f60ea4b64d6712e6f (diff)
downloadpoky-54d0147307e0fb581db20603cfec58d74343a0de.tar.gz
meta: remove True option to getVar and getVarFlag calls (again)
* True is default since 2016 and most layers were already updated not to pass this parameter where not necessary, e.g. oe-core was updated couple times, first in: https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f Updated with the same regexp as later oe-core update: https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba with small modification to replace not only d.getVar, but also data.getVar as in e.g.: e.data.getVar('ERR_REPORT_USERNAME', True) and for getVarFlag: sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \ -i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \ | cut -d':' -f1 \ | sort -u) (From OE-Core rev: de7bf6689a19dc614ce4b39c84ffd825bee1b962) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 26c74fd10614582e177437608908eb43688ab510) Signed-off-by: Steve Sakoman <steve@sakoman.com> (cherry picked from commit 24a86d0c55ee89ae0dc77975e1d0ee02898d2289) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager/deb/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py
index 86ddb130ad..910f217b62 100644
--- a/meta/lib/oe/package_manager/deb/__init__.py
+++ b/meta/lib/oe/package_manager/deb/__init__.py
@@ -80,15 +80,15 @@ class DpkgIndexer(Indexer):
80 return 80 return
81 81
82 oe.utils.multiprocess_launch(create_index, index_cmds, self.d) 82 oe.utils.multiprocess_launch(create_index, index_cmds, self.d)
83 if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': 83 if self.d.getVar('PACKAGE_FEED_SIGN') == '1':
84 signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) 84 signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND'))
85 else: 85 else:
86 signer = None 86 signer = None
87 if signer: 87 if signer:
88 for f in index_sign_files: 88 for f in index_sign_files:
89 signer.detach_sign(f, 89 signer.detach_sign(f,
90 self.d.getVar('PACKAGE_FEED_GPG_NAME', True), 90 self.d.getVar('PACKAGE_FEED_GPG_NAME'),
91 self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), 91 self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE'),
92 output_suffix="gpg", 92 output_suffix="gpg",
93 use_sha256=True) 93 use_sha256=True)
94 94