1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00

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>
This commit is contained in:
Richard Purdie
2020-07-30 23:01:06 +01:00
parent dca94d9aa4
commit b70c39767c
9 changed files with 15 additions and 7 deletions
@@ -2,6 +2,8 @@
# SPDX-License-Identifier: GPL-2.0-only
#
import re
import subprocess
from oe.package_manager import *
class DpkgIndexer(Indexer):
+2 -1
View File
@@ -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):
+2 -1
View File
@@ -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):
@@ -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):
@@ -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
+2 -2
View File
@@ -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):
@@ -2,6 +2,8 @@
# SPDX-License-Identifier: GPL-2.0-only
#
import shutil
import subprocess
from oe.package_manager import *
class RpmIndexer(Indexer):
+1 -1
View File
@@ -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"):
-2
View File
@@ -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):