From 287eccd7af7d97604ca68d456c23655fd1b6c40b Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 30 Jul 2020 23:01:06 +0100
Subject: 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>
---
 meta/lib/oe/package_manager/deb/__init__.py | 2 ++
 meta/lib/oe/package_manager/deb/rootfs.py   | 3 ++-
 meta/lib/oe/package_manager/deb/sdk.py      | 3 ++-
 meta/lib/oe/package_manager/ipk/__init__.py | 3 +++
 meta/lib/oe/package_manager/ipk/rootfs.py   | 1 +
 meta/lib/oe/package_manager/ipk/sdk.py      | 4 ++--
 meta/lib/oe/package_manager/rpm/__init__.py | 2 ++
 meta/lib/oe/package_manager/rpm/sdk.py      | 2 +-
 meta/lib/oe/sdk.py                          | 2 --
 9 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'meta/lib')

diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py
index 3c214e59dd..72155b178c 100644
--- 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 ac229f63d7..819f67eda5 100644
--- 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 3876f9b683..b25eb70b00 100644
--- 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 34500b8a0a..9603993a59 100644
--- 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 34dbcc27e6..63b4a59c40 100644
--- 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 e6d7b04bb8..47c0a92c1b 100644
--- 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 6183f81d58..c91f61ae5c 100644
--- 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 4d3f9461ef..b14b155a85 100644
--- 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 49f519891f..fdcadcb8de 100644
--- 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):
-- 
cgit 1.2.3-korg