diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/rootfs.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 75fba3911d..be9761c0d9 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -21,9 +21,6 @@ class Rootfs(object): | |||
21 | self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True) | 21 | self.image_rootfs = self.d.getVar('IMAGE_ROOTFS', True) |
22 | self.deploy_dir_image = self.d.getVar('DEPLOY_DIR_IMAGE', True) | 22 | self.deploy_dir_image = self.d.getVar('DEPLOY_DIR_IMAGE', True) |
23 | 23 | ||
24 | bb.utils.remove(self.image_rootfs, True) | ||
25 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) | ||
26 | |||
27 | self.install_order = Manifest.INSTALL_ORDER | 24 | self.install_order = Manifest.INSTALL_ORDER |
28 | 25 | ||
29 | @abstractmethod | 26 | @abstractmethod |
@@ -374,6 +371,8 @@ class DpkgRootfs(Rootfs): | |||
374 | def __init__(self, d, manifest_dir): | 371 | def __init__(self, d, manifest_dir): |
375 | super(DpkgRootfs, self).__init__(d) | 372 | super(DpkgRootfs, self).__init__(d) |
376 | 373 | ||
374 | bb.utils.remove(self.image_rootfs, True) | ||
375 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) | ||
377 | self.manifest = DpkgManifest(d, manifest_dir) | 376 | self.manifest = DpkgManifest(d, manifest_dir) |
378 | self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS', True), | 377 | self.pm = DpkgPM(d, d.getVar('IMAGE_ROOTFS', True), |
379 | d.getVar('PACKAGE_ARCHS', True), | 378 | d.getVar('PACKAGE_ARCHS', True), |
@@ -447,6 +446,8 @@ class OpkgRootfs(Rootfs): | |||
447 | def __init__(self, d, manifest_dir): | 446 | def __init__(self, d, manifest_dir): |
448 | super(OpkgRootfs, self).__init__(d) | 447 | super(OpkgRootfs, self).__init__(d) |
449 | 448 | ||
449 | bb.utils.remove(self.image_rootfs, True) | ||
450 | bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) | ||
450 | self.manifest = OpkgManifest(d, manifest_dir) | 451 | self.manifest = OpkgManifest(d, manifest_dir) |
451 | self.opkg_conf = self.d.getVar("IPKGCONF_TARGET", True) | 452 | self.opkg_conf = self.d.getVar("IPKGCONF_TARGET", True) |
452 | self.pkg_archs = self.d.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True) | 453 | self.pkg_archs = self.d.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True) |