From: Andrew Gaffney Date: Fri, 26 Dec 2008 13:29:04 +0000 (-0600) Subject: Apply patch from armin76 to actually make use of the busybox_config value in the... X-Git-Tag: CATALYST_2_0_6_916~49 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e07908feb6519fa906ed2b3be4015bc50130287;p=catalyst.git Apply patch from armin76 to actually make use of the busybox_config value in the spec --- diff --git a/ChangeLog b/ChangeLog index c394592b..d11a4e54 100644 --- 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 + 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 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 fe02600a..a0a0aaba 100644 --- 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: