package_manager: rootfs: remove install_order

The install_order instance variable was only ever set to
Manifest.INSTALL_ORDER, modified nowhere and used as is. Instead of
using an instance variable use Manifest.INSTALL_ORDER directly to
simplify the code for those reading it.

No functional changes.

Signed-off-by: Rouven Czerwinski <rouven.czerwinski@linaro.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oe/package_manager/deb/rootfs.py b/meta/lib/oe/package_manager/deb/rootfs.py
index 1e25b64ed99d45289a0b4e44315709b579c838e7..21d6cc5e5d0de308fc63d9c98609cdefacc518e2 100644 (file)
--- a/meta/lib/oe/package_manager/deb/rootfs.py
+++ b/meta/lib/oe/package_manager/deb/rootfs.py
@@ -162,7 +162,7 @@ class PkgRootfs(DpkgOpkgRootfs):
         if self.progress_reporter:
             self.progress_reporter.next_stage()
 
-        for pkg_type in self.install_order:
+        for pkg_type in Manifest.INSTALL_ORDER:
             if pkg_type in pkgs_to_install:
                 self.pm.install(pkgs_to_install[pkg_type],
                                 [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])

diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py b/meta/lib/oe/package_manager/ipk/rootfs.py
index ba93eb62ea83b568962e71e47e2ef7fe20e78daa..bc822bac87d97c81bac5fad0adc8224a0bb2630e 100644 (file)
--- a/meta/lib/oe/package_manager/ipk/rootfs.py
+++ b/meta/lib/oe/package_manager/ipk/rootfs.py
@@ -298,7 +298,7 @@ class PkgRootfs(DpkgOpkgRootfs):
         if self.progress_reporter:
             self.progress_reporter.next_stage()
 
-        for pkg_type in self.install_order:
+        for pkg_type in Manifest.INSTALL_ORDER:
             if pkg_type in pkgs_to_install:
                 # For multilib, we perform a sanity test before final install
                 # If sanity test fails, it will automatically do a bb.fatal()

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 7ef7e71f9e1e477765eac21e1ea05f51eaa72e32..5eee48f587157e5cd96a006487756a258ea79894 100644 (file)
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -27,8 +27,6 @@ class Rootfs(object, metaclass=ABCMeta):
         self.logcatcher = logcatcher
         self.warn_check_regex = r'^(warn|Warn|WARNING:)'
 
-        self.install_order = Manifest.INSTALL_ORDER
-
     @abstractmethod
     def _create(self):
         pass