From 961df760805a18770a897998a2617f24766d0a47 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 31 Jan 2017 10:37:13 -0500 Subject: utils: Shuffle [cf|mf|df]_enabled arguments Reorder the arguments to these functions so that an optional falsevalue can be provided. Signed-off-by: Brad Bishop Change-Id: I7eff61064d05d7f0983e404f2c67306ed12a237b --- meta-phosphor/classes/obmc-phosphor-utils.bbclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-phosphor/classes/obmc-phosphor-utils.bbclass') diff --git a/meta-phosphor/classes/obmc-phosphor-utils.bbclass b/meta-phosphor/classes/obmc-phosphor-utils.bbclass index b5073a635..713c892fb 100644 --- a/meta-phosphor/classes/obmc-phosphor-utils.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-utils.bbclass @@ -3,18 +3,18 @@ inherit utils -def df_enabled(feature, value, d): - return base_contains("DISTRO_FEATURES", feature, value, "", d) +def df_enabled(d, feature, truevalue, falsevalue=""): + return base_contains("DISTRO_FEATURES", feature, truevalue, falsevalue, d) -def mf_enabled(feature, value, d): - return base_contains("MACHINE_FEATURES", feature, value, "", d) +def mf_enabled(d, feature, truevalue, falsevalue=""): + return base_contains("MACHINE_FEATURES", feature, truevalue, falsevalue, d) -def cf_enabled(feature, value, d): - return value if df_enabled(feature, value, d) \ - and mf_enabled(feature, value, d) \ - else "" +def cf_enabled(d, feature, truevalue, falsevalue=""): + return truevalue if df_enabled(d, feature, truevalue) \ + and mf_enabled(d, feature, truevalue) \ + else falsevalue def set_append(d, var, val, sep=' '): -- cgit v1.2.3