summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/rootfs.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r--meta/lib/oe/rootfs.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index dddbef4d64..3d1111a40a 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -1,6 +1,5 @@
1from abc import ABCMeta, abstractmethod 1from abc import ABCMeta, abstractmethod
2from oe.utils import execute_pre_post_process 2from oe.utils import execute_pre_post_process
3from oe.utils import contains as base_contains
4from oe.package_manager import * 3from oe.package_manager import *
5from oe.manifest import * 4from oe.manifest import *
6import oe.path 5import oe.path
@@ -42,7 +41,7 @@ class Rootfs(object):
42 pass 41 pass
43 42
44 def _insert_feed_uris(self): 43 def _insert_feed_uris(self):
45 if base_contains("IMAGE_FEATURES", "package-management", 44 if bb.utils.contains("IMAGE_FEATURES", "package-management",
46 True, False, self.d): 45 True, False, self.d):
47 self.pm.insert_feeds_uris() 46 self.pm.insert_feeds_uris()
48 47
@@ -108,7 +107,7 @@ class Rootfs(object):
108 107
109 execute_pre_post_process(self.d, post_process_cmds) 108 execute_pre_post_process(self.d, post_process_cmds)
110 109
111 if base_contains("IMAGE_FEATURES", "read-only-rootfs", 110 if bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs",
112 True, False, self.d): 111 True, False, self.d):
113 delayed_postinsts = self._get_delayed_postinsts() 112 delayed_postinsts = self._get_delayed_postinsts()
114 if delayed_postinsts is not None: 113 if delayed_postinsts is not None:
@@ -130,7 +129,7 @@ class Rootfs(object):
130 self._cleanup() 129 self._cleanup()
131 130
132 def _uninstall_uneeded(self): 131 def _uninstall_uneeded(self):
133 if base_contains("IMAGE_FEATURES", "package-management", 132 if bb.utils.contains("IMAGE_FEATURES", "package-management",
134 True, False, self.d): 133 True, False, self.d):
135 return 134 return
136 135