package_manager: sdk: 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/sdk.py b/meta/lib/oe/package_manager/deb/sdk.py
index 6f3005053ebc4520f4cf709d8c907b4972eebe35..1169744674dd5142b1c787dd7800d3bb1ff49547 100644 (file)
--- a/meta/lib/oe/package_manager/deb/sdk.py
+++ b/meta/lib/oe/package_manager/deb/sdk.py
@@ -54,7 +54,7 @@ class PkgSdk(Sdk):
         pm.write_index()
         pm.update()
 
-        for pkg_type in self.install_order:
+        for pkg_type in Manifest.INSTALL_ORDER:
             if pkg_type in pkgs_to_install:
                 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/sdk.py b/meta/lib/oe/package_manager/ipk/sdk.py
index 3acd55f548d3afff4750f4d2bf9582ce6650c8e1..c39a32fa2474b33b5d2c7b67da1071fbf4c4aec4 100644 (file)
--- a/meta/lib/oe/package_manager/ipk/sdk.py
+++ b/meta/lib/oe/package_manager/ipk/sdk.py
@@ -50,7 +50,7 @@ class PkgSdk(Sdk):
 
         pm.update()
 
-        for pkg_type in self.install_order:
+        for pkg_type in Manifest.INSTALL_ORDER:
             if pkg_type in pkgs_to_install:
                 pm.install(pkgs_to_install[pkg_type],
                            [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])

diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
index 9fe0fbb752dbad11e66c68d410f18baaa2b80bae..c2c5431c0d8c8f471160e6e62d3649987ddd61cd 100644 (file)
--- a/meta/lib/oe/sdk.py
+++ b/meta/lib/oe/sdk.py
@@ -29,8 +29,6 @@ class Sdk(object, metaclass=ABCMeta):
 
         self.remove(self.sdk_output, True)
 
-        self.install_order = Manifest.INSTALL_ORDER
-
     @abstractmethod
     def _populate(self):
         pass