diff options
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r-- | meta/lib/oe/rootfs.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 90c0504b31..30a1321db1 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -41,9 +41,10 @@ class Rootfs(object): | |||
41 | def _log_check(self): | 41 | def _log_check(self): |
42 | pass | 42 | pass |
43 | 43 | ||
44 | @abstractmethod | ||
45 | def _insert_feed_uris(self): | 44 | def _insert_feed_uris(self): |
46 | pass | 45 | if base_contains("IMAGE_FEATURES", "package-management", |
46 | True, False, self.d): | ||
47 | self.pm.insert_feeds_uris() | ||
47 | 48 | ||
48 | @abstractmethod | 49 | @abstractmethod |
49 | def _handle_intercept_failure(self, failed_script): | 50 | def _handle_intercept_failure(self, failed_script): |
@@ -349,9 +350,6 @@ class RpmRootfs(Rootfs): | |||
349 | if found_error == 6: | 350 | if found_error == 6: |
350 | bb.fatal(message) | 351 | bb.fatal(message) |
351 | 352 | ||
352 | def _insert_feed_uris(self): | ||
353 | pass | ||
354 | |||
355 | def _handle_intercept_failure(self, registered_pkgs): | 353 | def _handle_intercept_failure(self, registered_pkgs): |
356 | rpm_postinsts_dir = self.image_rootfs + self.d.expand('${sysconfdir}/rpm-postinsts/') | 354 | rpm_postinsts_dir = self.image_rootfs + self.d.expand('${sysconfdir}/rpm-postinsts/') |
357 | bb.utils.mkdirhier(rpm_postinsts_dir) | 355 | bb.utils.mkdirhier(rpm_postinsts_dir) |
@@ -372,6 +370,7 @@ class DpkgRootfs(Rootfs): | |||
372 | d.getVar('PACKAGE_ARCHS', True), | 370 | d.getVar('PACKAGE_ARCHS', True), |
373 | d.getVar('DPKG_ARCH', True)) | 371 | d.getVar('DPKG_ARCH', True)) |
374 | 372 | ||
373 | |||
375 | def _create(self): | 374 | def _create(self): |
376 | pkgs_to_install = self.manifest.parse_initial_manifest() | 375 | pkgs_to_install = self.manifest.parse_initial_manifest() |
377 | 376 | ||
@@ -432,9 +431,6 @@ class DpkgRootfs(Rootfs): | |||
432 | def _log_check(self): | 431 | def _log_check(self): |
433 | pass | 432 | pass |
434 | 433 | ||
435 | def _insert_feed_uris(self): | ||
436 | pass | ||
437 | |||
438 | 434 | ||
439 | class OpkgRootfs(Rootfs): | 435 | class OpkgRootfs(Rootfs): |
440 | def __init__(self, d, manifest_dir): | 436 | def __init__(self, d, manifest_dir): |
@@ -698,10 +694,6 @@ class OpkgRootfs(Rootfs): | |||
698 | def _log_check(self): | 694 | def _log_check(self): |
699 | pass | 695 | pass |
700 | 696 | ||
701 | def _insert_feed_uris(self): | ||
702 | pass | ||
703 | |||
704 | |||
705 | def create_rootfs(d, manifest_dir=None): | 697 | def create_rootfs(d, manifest_dir=None): |
706 | env_bkp = os.environ.copy() | 698 | env_bkp = os.environ.copy() |
707 | 699 | ||