summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2020-11-16 10:21:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-24 15:26:12 +0000
commit37b51ed0764e7dd953448e61757a91df31dd11a0 (patch)
tree8cfa4e2ab2e0f29597b530a04685d60b94663f72
parentac0dc5850b572864389d27a31550c361bdaa7bcf (diff)
downloadpoky-37b51ed0764e7dd953448e61757a91df31dd11a0.tar.gz
poky-37b51ed0764e7dd953448e61757a91df31dd11a0.tar.bz2
poky-37b51ed0764e7dd953448e61757a91df31dd11a0.zip
bitbake: Revert "bb.ui: delete __init__.py to make bb.ui a namespace package"
The commit [991f92b4d bb.ui: delete __init__.py to make bb.ui a namespace package] caused `bitbake -h' failed ... $ bitbake -h Traceback (most recent call last): File "/buildarea/raid5/hjia/community/poky/bitbake/bin/bitbake", line 35, in <module> sys.exit(bitbake_main(BitBakeConfigParameters(sys.argv), File "/buildarea/raid5/hjia/community/poky/bitbake/lib/bb/cookerdata.py", line 27, in __init__ self.options, targets = self.parseCommandLine(argv or sys.argv) File "/buildarea/raid5/hjia/community/poky/bitbake/lib/bb/main.py", line 297, in parseCommandLine options, targets = parser.parse_args(argv) File "/usr/lib64/python3.6/optparse.py", line 1387, in parse_args stop = self._process_args(largs, rargs, values) File "/usr/lib64/python3.6/optparse.py", line 1431, in _process_args self._process_short_opts(rargs, values) File "/usr/lib64/python3.6/optparse.py", line 1536, in _process_short_opts option.process(opt, value, values, self) File "/usr/lib64/python3.6/optparse.py", line 785, in process self.action, self.dest, opt, value, values, parser) File "/usr/lib64/python3.6/optparse.py", line 807, in take_action parser.print_help() File "/usr/lib64/python3.6/optparse.py", line 1647, in print_help file.write(self.format_help()) File "/usr/lib64/python3.6/optparse.py", line 1635, in format_help result.append(self.format_option_help(formatter)) File "/usr/lib64/python3.6/optparse.py", line 1615, in format_option_help result.append(OptionContainer.format_option_help(self, formatter)) File "/usr/lib64/python3.6/optparse.py", line 1061, in format_option_help result.append(formatter.format_option(option)) File "/buildarea/raid5/hjia/community/poky/bitbake/lib/bb/main.py", line 54, in format_option valid_uis = list_extension_modules(bb.ui, 'main') File "/buildarea/raid5/hjia/community/poky/bitbake/lib/bb/main.py", line 72, in list_extension_modules pkgdir = os.path.dirname(pkg.__file__) AttributeError: module 'bb.ui' has no attribute '__file__' ... This reverts commit 991f92b4d15b0571b6a540964e5216d1b9728539 (Bitbake rev: 22b8c53205f8915b33d1e0ad6a666dcacc01491d) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/__init__.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/__init__.py b/bitbake/lib/bb/ui/__init__.py
new file mode 100644
index 0000000000..4b7ac36ca6
--- /dev/null
+++ b/bitbake/lib/bb/ui/__init__.py
@@ -0,0 +1,7 @@
+#
+# BitBake UI Implementation
+#
+# Copyright (C) 2006-2007 Richard Purdie
+#
+# SPDX-License-Identifier: GPL-2.0-only
+#