lib/package_manager: Fix missing imports

The package_manager code rearranging had some issues with module imports that
were now missing. Fix all the ones I could spot from quick inspection.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py
index 3c214e59dd251384ba1963615d1189ec14d73981..72155b178c944ac06aeaf877170e2800d171a5b4 100644 (file)
--- a/meta/lib/oe/package_manager/deb/__init__.py
+++ b/meta/lib/oe/package_manager/deb/__init__.py
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
+import re
+import subprocess
 from oe.package_manager import *
 
 class DpkgIndexer(Indexer):

diff --git a/meta/lib/oe/package_manager/deb/rootfs.py b/meta/lib/oe/package_manager/deb/rootfs.py
index ac229f63d7a802b870c5af617143808dd58c5e3f..819f67eda5c813f0a5593d4eb93b829ef3e153aa 100644 (file)
--- a/meta/lib/oe/package_manager/deb/rootfs.py
+++ b/meta/lib/oe/package_manager/deb/rootfs.py
@@ -2,11 +2,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
+import re
+import shutil
 from oe.rootfs import Rootfs
 from oe.manifest import Manifest
 from oe.utils import execute_pre_post_process
 from oe.package_manager.deb.manifest import DpkgManifest
-import re
 from oe.package_manager.deb import DpkgPM
 
 class DpkgOpkgRootfs(Rootfs):

diff --git a/meta/lib/oe/package_manager/deb/sdk.py b/meta/lib/oe/package_manager/deb/sdk.py
index 3876f9b6833a4d5ae3a7c5c1d19f66f99ab256c5..b25eb70b00d5b82589a1f841140f341a62034c7e 100644 (file)
--- a/meta/lib/oe/package_manager/deb/sdk.py
+++ b/meta/lib/oe/package_manager/deb/sdk.py
@@ -2,11 +2,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
+import glob
+import shutil
 from oe.utils import execute_pre_post_process
 from oe.sdk import Sdk
 from oe.manifest import Manifest
 from oe.package_manager.deb import DpkgPM
-import shutil
 
 class DpkgSdk(Sdk):
     def __init__(self, d, manifest_dir=None):

diff --git a/meta/lib/oe/package_manager/ipk/__init__.py b/meta/lib/oe/package_manager/ipk/__init__.py
index 34500b8a0a9ed9f7111175e2383f8f27f21afe7b..9603993a591dd79161e8a9f1325e6982ffca0cd4 100644 (file)
--- a/meta/lib/oe/package_manager/ipk/__init__.py
+++ b/meta/lib/oe/package_manager/ipk/__init__.py
@@ -2,6 +2,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
+import re
+import shutil
+import subprocess
 from oe.package_manager import *
 
 class OpkgIndexer(Indexer):

diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py b/meta/lib/oe/package_manager/ipk/rootfs.py
index 34dbcc27e641d44058bc507f3054337774a809fa..63b4a59c4015d31e1f1af4ec2f48d4cdf091749a 100644 (file)
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -4,6 +4,7 @@
 
 import re
 import filecmp
+import shutil
 from oe.rootfs import Rootfs
 from oe.manifest import Manifest
 from oe.utils import execute_pre_post_process

diff --git a/meta/lib/oe/package_manager/ipk/sdk.py b/meta/lib/oe/package_manager/ipk/sdk.py
index e6d7b04bb88a397f31baf8e68cf535f6fae7663f..47c0a92c1b6b04561c3f21265b8baa55886da040 100644 (file)
--- a/meta/lib/oe/package_manager/ipk/sdk.py
+++ b/meta/lib/oe/package_manager/ipk/sdk.py
@@ -2,12 +2,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
+import glob
+import shutil
 from oe.utils import execute_pre_post_process
 from oe.sdk import Sdk
 from oe.manifest import Manifest
 from oe.package_manager.ipk import OpkgPM
-import shutil
-import glob
 
 class OpkgSdk(Sdk):
     def __init__(self, d, manifest_dir=None):

diff --git a/meta/lib/oe/package_manager/rpm/__init__.py b/meta/lib/oe/package_manager/rpm/__init__.py
index 6183f81d5861c4ca4b1daada6c80152e0c384515..c91f61ae5c11c07b7e7c0c00587de64aa31872d4 100644 (file)
--- a/meta/lib/oe/package_manager/rpm/__init__.py
+++ b/meta/lib/oe/package_manager/rpm/__init__.py
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
+import shutil
+import subprocess
 from oe.package_manager import *
 
 class RpmIndexer(Indexer):

diff --git a/meta/lib/oe/package_manager/rpm/sdk.py b/meta/lib/oe/package_manager/rpm/sdk.py
index 4d3f9461ef90d456f4bae5046642313e525f7787..b14b155a85e16c2dd386cb282249bb0128af0b4b 100644 (file)
--- a/meta/lib/oe/package_manager/rpm/sdk.py
+++ b/meta/lib/oe/package_manager/rpm/sdk.py
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
 
+import glob
 from oe.utils import execute_pre_post_process
 from oe.sdk import Sdk
 from oe.manifest import Manifest
 from oe.package_manager.rpm import RpmPM
-import glob
 
 class RpmSdk(Sdk):
     def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"):

diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
index 49f519891fba8b334b6e710786b9ff31876c1e69..fdcadcb8dee23bf9ba7c1f738b2132dd5be9f9f3 100644 (file)
--- a/meta/lib/oe/sdk.py
+++ b/meta/lib/oe/sdk.py
@@ -7,8 +7,6 @@ from oe.utils import execute_pre_post_process
 from oe.manifest import *
 from oe.package_manager import *
 import os
-import shutil
-import glob
 import traceback
 
 class Sdk(object, metaclass=ABCMeta):