From: Richard Purdie Date: Thu, 23 Aug 2018 11:54:21 +0000 (+0000) Subject: utils: Fix patch merging error X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~16901 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02c8d048cbab38a48f698504d0f5e912d3d24a36;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git utils: Fix patch merging error The previous patch has duplicate split calls and one needs to be removed to avoid failures Signed-off-by: Richard Purdie --- diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 812129fda7b..e12e93af24a 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -362,7 +362,7 @@ def all_multilib_tune_list(vars, d): values[v] = [] variants = (d.getVar("MULTILIB_VARIANTS") or "").split() + [''] - for item in variants.split(): + for item in variants: localdata = get_multilib_datastore(item, d) values[v].append(localdata.getVar(v)) values['ml'].append(item)