1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00

Globally replace oe.utils.contains to bb.utils.contains

BitBake has the exact same code as oe.utils.contains so there's no
reason to duplicate it. We now rely on the bb.utils.contains code for
metadata.

(From OE-Core rev: 93499ebc46547f5bf6dcecd5a786ead9f726de28)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Otavio Salvador
2014-04-24 15:59:19 -03:00
committed by Richard Purdie
parent f11e9e295d
commit 08a38a7865
15 changed files with 25 additions and 39 deletions
+3 -4
View File
@@ -1,6 +1,5 @@
from abc import ABCMeta, abstractmethod
from oe.utils import execute_pre_post_process
from oe.utils import contains as base_contains
from oe.package_manager import *
from oe.manifest import *
import oe.path
@@ -42,7 +41,7 @@ class Rootfs(object):
pass
def _insert_feed_uris(self):
if base_contains("IMAGE_FEATURES", "package-management",
if bb.utils.contains("IMAGE_FEATURES", "package-management",
True, False, self.d):
self.pm.insert_feeds_uris()
@@ -108,7 +107,7 @@ class Rootfs(object):
execute_pre_post_process(self.d, post_process_cmds)
if base_contains("IMAGE_FEATURES", "read-only-rootfs",
if bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs",
True, False, self.d):
delayed_postinsts = self._get_delayed_postinsts()
if delayed_postinsts is not None:
@@ -130,7 +129,7 @@ class Rootfs(object):
self._cleanup()
def _uninstall_uneeded(self):
if base_contains("IMAGE_FEATURES", "package-management",
if bb.utils.contains("IMAGE_FEATURES", "package-management",
True, False, self.d):
return