summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-30 23:01:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-01 19:57:49 +0100
commitb70c39767c98231176acf275953f16dd3a8ede38 (patch)
tree5271c8728a3dcc90eeb6e24560760f97639fda5c /meta/lib
parentdca94d9aa4672cf6beccbaf6b9a09ad83847c59e (diff)
downloadpoky-b70c39767c98231176acf275953f16dd3a8ede38.tar.gz
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. (From OE-Core rev: 287eccd7af7d97604ca68d456c23655fd1b6c40b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager/deb/__init__.py2
-rw-r--r--meta/lib/oe/package_manager/deb/rootfs.py3
-rw-r--r--meta/lib/oe/package_manager/deb/sdk.py3
-rw-r--r--meta/lib/oe/package_manager/ipk/__init__.py3
-rw-r--r--meta/lib/oe/package_manager/ipk/rootfs.py1
-rw-r--r--meta/lib/oe/package_manager/ipk/sdk.py4
-rw-r--r--meta/lib/oe/package_manager/rpm/__init__.py2
-rw-r--r--meta/lib/oe/package_manager/rpm/sdk.py2
-rw-r--r--meta/lib/oe/sdk.py2
9 files changed, 15 insertions, 7 deletions
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 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5import re
6import subprocess
5from oe.package_manager import * 7from oe.package_manager import *
6 8
7class DpkgIndexer(Indexer): 9class 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 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5import re
6import shutil
5from oe.rootfs import Rootfs 7from oe.rootfs import Rootfs
6from oe.manifest import Manifest 8from oe.manifest import Manifest
7from oe.utils import execute_pre_post_process 9from oe.utils import execute_pre_post_process
8from oe.package_manager.deb.manifest import DpkgManifest 10from oe.package_manager.deb.manifest import DpkgManifest
9import re
10from oe.package_manager.deb import DpkgPM 11from oe.package_manager.deb import DpkgPM
11 12
12class DpkgOpkgRootfs(Rootfs): 13class 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 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5import glob
6import shutil
5from oe.utils import execute_pre_post_process 7from oe.utils import execute_pre_post_process
6from oe.sdk import Sdk 8from oe.sdk import Sdk
7from oe.manifest import Manifest 9from oe.manifest import Manifest
8from oe.package_manager.deb import DpkgPM 10from oe.package_manager.deb import DpkgPM
9import shutil
10 11
11class DpkgSdk(Sdk): 12class DpkgSdk(Sdk):
12 def __init__(self, d, manifest_dir=None): 13 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 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5import re
6import shutil
7import subprocess
5from oe.package_manager import * 8from oe.package_manager import *
6 9
7class OpkgIndexer(Indexer): 10class 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 @@
4 4
5import re 5import re
6import filecmp 6import filecmp
7import shutil
7from oe.rootfs import Rootfs 8from oe.rootfs import Rootfs
8from oe.manifest import Manifest 9from oe.manifest import Manifest
9from oe.utils import execute_pre_post_process 10from 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 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5import glob
6import shutil
5from oe.utils import execute_pre_post_process 7from oe.utils import execute_pre_post_process
6from oe.sdk import Sdk 8from oe.sdk import Sdk
7from oe.manifest import Manifest 9from oe.manifest import Manifest
8from oe.package_manager.ipk import OpkgPM 10from oe.package_manager.ipk import OpkgPM
9import shutil
10import glob
11 11
12class OpkgSdk(Sdk): 12class OpkgSdk(Sdk):
13 def __init__(self, d, manifest_dir=None): 13 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 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5import shutil
6import subprocess
5from oe.package_manager import * 7from oe.package_manager import *
6 8
7class RpmIndexer(Indexer): 9class 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 @@
2# SPDX-License-Identifier: GPL-2.0-only 2# SPDX-License-Identifier: GPL-2.0-only
3# 3#
4 4
5import glob
5from oe.utils import execute_pre_post_process 6from oe.utils import execute_pre_post_process
6from oe.sdk import Sdk 7from oe.sdk import Sdk
7from oe.manifest import Manifest 8from oe.manifest import Manifest
8from oe.package_manager.rpm import RpmPM 9from oe.package_manager.rpm import RpmPM
9import glob
10 10
11class RpmSdk(Sdk): 11class RpmSdk(Sdk):
12 def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"): 12 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
7from oe.manifest import * 7from oe.manifest import *
8from oe.package_manager import * 8from oe.package_manager import *
9import os 9import os
10import shutil
11import glob
12import traceback 10import traceback
13 11
14class Sdk(object, metaclass=ABCMeta): 12class Sdk(object, metaclass=ABCMeta):