diff options
| author |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2018-11-07 14:47:16 -0500 |
|---|---|---|
| committer | Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2018-11-07 14:49:47 -0500 |
| commit | 44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25 (patch) | |
| tree | 0d72a3a0eb4d896cc93c7efdd6c766b2959d6066 | |
| parent | create-iso.sh: use --apparent-size when calculating ESP size (diff) | |
| download | catalyst-44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25.tar.gz catalyst-44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25.tar.bz2 catalyst-44fcaf16a9eb5b17b6f0b6a61647c97ccc92cd25.zip | |
allow custom COMMON_FLAGS
instead of forcing the user to override *FLAGS, just let them set
COMMON_FLAGS directly
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
| -rw-r--r-- | catalyst/base/stagebase.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 7665834c..54a1f389 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -39,7 +39,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "rel_type", "profile", "snapshot", "source_subpath", "portage_confdir", "portage_prefix", "portage_overlay", "cflags", "cxxflags", "fcflags", "fflags", "ldflags", "asflags", - "cbuild", "hostuse", "catalyst_use", + "common_flags", "cbuild", "hostuse", "catalyst_use", "distcc_hosts", "makeopts", "pkgcache_path", "kerncache_path", "compression_mode", "decompression_mode"]) @@ -305,6 +305,10 @@ class StageBase(TargetBase, ClearBase, GenBase): if "ASFLAGS" in self.makeconf: self.settings["ASFLAGS"] = self.makeconf["ASFLAGS"] + def override_common_flags(self): + if "COMMON_FLAGS" in self.makeconf: + self.settings["COMMON_FLAGS"] = self.makeconf["COMMON_FLAGS"] + def set_install_mask(self): if "install_mask" in self.settings: if not isinstance(self.settings['install_mask'], str): @@ -1042,6 +1046,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.override_fflags() self.override_ldflags() self.override_asflags() + self.override_common_flags() if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("chroot_setup"): log.notice('Resume point detected, skipping chroot_setup operation...') |