Apply patch from armin76 to actually make use of the busybox_config value in the...

diff --git a/ChangeLog b/ChangeLog
index c394592bc04c314769af5bf6e0a8dec005d89e46..d11a4e544132318d4f165ba2654e31779339839e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney
 # Distributed under the GPL v2
 
+  26 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
+  modules/generic_stage_target.py:
+  Apply patch from armin76 to actually make use of the busybox_config value
+  in the spec
+
   24 Dec 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/netboot2/netboot2-controller.sh, targets/support/kmerge.sh:
   Add support for gk's --busybox-config= option

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index fe02600aacb59d9cb7e5537676ccf1cb30ed91f1..a0a0aaba69c5b0164b62ab342cbe6c14236b7843 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -159,6 +159,7 @@ class generic_stage_target(generic_target):
                self.set_packages()
                self.set_rm()
                self.set_linuxrc()
+               self.set_busybox_config()
                self.set_overlay()
                self.set_portage_overlay()
                self.set_root_overlay()
@@ -499,6 +500,14 @@ class generic_stage_target(generic_target):
                                        self.settings[self.settings["spec_prefix"]+"/linuxrc"]
                                del self.settings[self.settings["spec_prefix"]+"/linuxrc"]
 
+       def set_busybox_config(self):
+               if self.settings.has_key(self.settings["spec_prefix"]+"/busybox_config"):
+                       if type(self.settings[self.settings["spec_prefix"]+\
+                               "/busybox_config"])==types.StringType:
+                               self.settings["busybox_config"]=\
+                                       self.settings[self.settings["spec_prefix"]+"/busybox_config"]
+                               del self.settings[self.settings["spec_prefix"]+"/busybox_config"]
+
        def set_portage_overlay(self):
                if self.settings.has_key("portage_overlay"):
                        if type(self.settings["portage_overlay"])==types.StringType: