[OE-core][PATCH] Fix up bitbake logging compatibility

[OE-core][PATCH] Fix up bitbake logging compatibility

[Joshua Watt]

Bitbake changed the debug() logging call to make it compatible with
standard python logging by no longer including a debug level as the
first argument. Fix up the few places this was being used and remove the
make_logger_bitbake_compatible() API, as it is no longer needed

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 meta/classes/testimage.bbclass         |  3 +--
 meta/lib/oe/terminal.py                |  4 ++--
 meta/lib/oeqa/sdk/testsdk.py           |  3 +--
 meta/lib/oeqa/utils/__init__.py        | 30 --------------------------
 meta/lib/oeqa/utils/package_manager.py |  4 ++--
 5 files changed, 6 insertions(+), 38 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 78da4b09bd..374171f2f5 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -202,7 +202,6 @@ def testimage_main(d):
     from oeqa.runtime.context import OERuntimeTestContextExecutor
     from oeqa.core.target.qemu import supported_fstypes
     from oeqa.core.utils.test import getSuiteCases
-    from oeqa.utils import make_logger_bitbake_compatible
 
     def sigterm_exception(signum, stackframe):
         """
@@ -220,7 +219,7 @@ def testimage_main(d):
        and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES'))):
         create_rpm_index(d)
 
-    logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
+    logger = logging.getLogger("BitBake")
     pn = d.getVar("PN")
 
     bb.utils.mkdirhier(d.getVar("TEST_LOG_DIR"))
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index eb10a6e33e..61c2687ef4 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -185,7 +185,7 @@ class Custom(Terminal):
             Terminal.__init__(self, sh_cmd, title, env, d)
             logger.warning('Custom terminal was started.')
         else:
-            logger.debug(1, 'No custom terminal (OE_TERMINAL_CUSTOMCMD) set')
+            logger.debug('No custom terminal (OE_TERMINAL_CUSTOMCMD) set')
             raise UnsupportedTerminal('OE_TERMINAL_CUSTOMCMD not set')
 
 
@@ -216,7 +216,7 @@ def spawn_preferred(sh_cmd, title=None, env=None, d=None):
 
 def spawn(name, sh_cmd, title=None, env=None, d=None):
     """Spawn the specified terminal, by name"""
-    logger.debug(1, 'Attempting to spawn terminal "%s"', name)
+    logger.debug('Attempting to spawn terminal "%s"', name)
     try:
         terminal = Registry.registry[name]
     except KeyError:
diff --git a/meta/lib/oeqa/sdk/testsdk.py b/meta/lib/oeqa/sdk/testsdk.py
index 35e40187bc..04eb109dd4 100644
--- a/meta/lib/oeqa/sdk/testsdk.py
+++ b/meta/lib/oeqa/sdk/testsdk.py
@@ -71,10 +71,9 @@ class TestSDK(TestSDKBase):
         import logging
 
         from bb.utils import export_proxies
-        from oeqa.utils import make_logger_bitbake_compatible
 
         pn = d.getVar("PN")
-        logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
+        logger = logging.getLogger("BitBake")
 
         # sdk use network for download projects for build
         export_proxies(d)
diff --git a/meta/lib/oeqa/utils/__init__.py b/meta/lib/oeqa/utils/__init__.py
index 70fbe7b552..39dde8d05c 100644
--- a/meta/lib/oeqa/utils/__init__.py
+++ b/meta/lib/oeqa/utils/__init__.py
@@ -39,36 +39,6 @@ def avoid_paths_in_environ(paths):
     new_path = new_path[:-1]
     return new_path
 
-def make_logger_bitbake_compatible(logger):
-    import logging
-
-    """ 
-        Bitbake logger redifines debug() in order to
-        set a level within debug, this breaks compatibility
-        with vainilla logging, so we neeed to redifine debug()
-        method again also add info() method with INFO + 1 level.
-    """
-    def _bitbake_log_debug(*args, **kwargs):
-        lvl = logging.DEBUG
-
-        if isinstance(args[0], int):
-            lvl = args[0]
-            msg = args[1]
-            args = args[2:]
-        else:
-            msg = args[0]
-            args = args[1:]
-
-        logger.log(lvl, msg, *args, **kwargs)
-    
-    def _bitbake_log_info(msg, *args, **kwargs):
-        logger.log(logging.INFO + 1, msg, *args, **kwargs)
-
-    logger.debug = _bitbake_log_debug
-    logger.info = _bitbake_log_info
-
-    return logger
-
 def load_test_components(logger, executor):
     import sys
     import os
diff --git a/meta/lib/oeqa/utils/package_manager.py b/meta/lib/oeqa/utils/package_manager.py
index 3623299295..6b67f22fdd 100644
--- a/meta/lib/oeqa/utils/package_manager.py
+++ b/meta/lib/oeqa/utils/package_manager.py
@@ -117,7 +117,7 @@ def extract_packages(d, needed_packages):
             extract = package.get('extract', True)
 
             if extract:
-                #logger.debug(1, 'Extracting %s' % pkg)
+                #logger.debug('Extracting %s' % pkg)
                 dst_dir = os.path.join(extracted_path, pkg)
                 # Same package used for more than one test,
                 # don't need to extract again.
@@ -130,7 +130,7 @@ def extract_packages(d, needed_packages):
                 shutil.rmtree(pkg_dir)
 
             else:
-                #logger.debug(1, 'Copying %s' % pkg)
+                #logger.debug('Copying %s' % pkg)
                 _copy_package(d, pkg)
 
 def _extract_in_tmpdir(d, pkg):
-- 
2.30.0