[elbe-devel] [PATCH 3/3] Remove grub-pc from buildenv pkgs

[bage at linutronix.de]

From: Bastian Germann <bage at linutronix.de>

On existence of grub-install elbe added grub-pc to the buildenv package list up
to now.  However, there are many different grub-install variants which may
conflict with grub-pc.  Remove grub-pc from this implicit list.

Additionally, simplify the logic to get rid of one variable.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/commands/adjustpkgs.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/elbepack/commands/adjustpkgs.py b/elbepack/commands/adjustpkgs.py
index 90c677ede..f6bd58db5 100644
--- a/elbepack/commands/adjustpkgs.py
+++ b/elbepack/commands/adjustpkgs.py
@@ -96,24 +96,20 @@ def run_command(argv):
     xml_pkglist = xml.node("/target/pkg-list")
     xml_pkgs = [p.et.text for p in xml_pkglist]
 
-    mandatory_pkgs = ["python-elbe-buildenv"]
-    if xml.has("target/images/msdoshd/grub-install"):
-        mandatory_pkgs = ["python-elbe-buildenv", "grub-pc"]
-
     # TODO: install buildimage packages after target image generation
     #         and remove theme before target image generation
     #         we need to introduce additional arguments for this
     #       in default copy mode chroot to the target and remove elbe-daemon
     #         and its dependencies (if it is not in  target/pkg-list.
-    buildenv_pkgs = []
+    buildenv_pkgs = ["python-elbe-buildenv"]
     if xml.has("./project/buildimage/pkg-list"):
-        buildenv_pkgs = [p.et.text for p in xml.node(
-            "project/buildimage/pkg-list")]
+        buildenv_pkgs.extend([p.et.text for p in xml.node(
+            "project/buildimage/pkg-list")])
 
 
     with elbe_logging({"files":opt.output}):
         adj = adjpkg(opt.name)
-        return adj.set_pkgs(xml_pkgs + mandatory_pkgs + buildenv_pkgs)
+        return adj.set_pkgs(xml_pkgs + buildenv_pkgs)
 
 
 if __name__ == "__main__":
-- 
2.20.1