From 58449f0e9cc4a05c88204cf8ba887b55467d886e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 29 Jan 2018 17:11:10 +0000 Subject: classes/utils: remove compatibility functions These base_* functions were moved into meta/lib/oe back in 2010 and wrappers left in utils.bbclass for compatibility. It's been eight years, so I think it's time to remove them. (From OE-Core rev: 0391fcad9103abca0796a068f957d0df63ab4776) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/utils.bbclass | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 32cae7e312..4f016e3d00 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -1,44 +1,3 @@ -# For compatibility -def base_path_join(a, *p): - return oe.path.join(a, *p) - -def base_path_relative(src, dest): - return oe.path.relative(src, dest) - -def base_path_out(path, d): - return oe.path.format_display(path, d) - -def base_read_file(filename): - return oe.utils.read_file(filename) - -def base_ifelse(condition, iftrue = True, iffalse = False): - return oe.utils.ifelse(condition, iftrue, iffalse) - -def base_conditional(variable, checkvalue, truevalue, falsevalue, d): - return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d) - -def base_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): - return oe.utils.less_or_equal(variable, checkvalue, truevalue, falsevalue, d) - -def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): - return oe.utils.version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d) - -def base_contains(variable, checkvalues, truevalue, falsevalue, d): - bb.note('base_contains is deprecated, please use bb.utils.contains instead.') - return bb.utils.contains(variable, checkvalues, truevalue, falsevalue, d) - -def base_both_contain(variable1, variable2, checkvalue, d): - return oe.utils.both_contain(variable1, variable2, checkvalue, d) - -def base_prune_suffix(var, suffixes, d): - return oe.utils.prune_suffix(var, suffixes, d) - -def oe_filter(f, str, d): - return oe.utils.str_filter(f, str, d) - -def oe_filter_out(f, str, d): - return oe.utils.str_filter_out(f, str, d) - def machine_paths(d): """List any existing machine specific filespath directories""" machine = d.getVar("MACHINE") -- cgit v1.2.3-54-g00ecf