From ca93c215fdd2e0f3b0ab4a205ccf80e5077e5d06 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 7 Apr 2024 10:09:47 -0700 Subject: sanity: Use diff instead of meld by default meld fallback assumes that user has a gnome desktop its better to fallback to good old diff tool which will most distributions on build host will carry (From OE-Core rev: d027236eac2a136b06903d4a47adbc50ccd6b7c6) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes-global/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes-global') diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass index bbbc41ddae..180c6b77d8 100644 --- a/meta/classes-global/sanity.bbclass +++ b/meta/classes-global/sanity.bbclass @@ -40,7 +40,7 @@ BBLAYERS_CONF_UPDATE_FUNCS += " \ conf/site.conf:SCONF_VERSION:SITE_CONF_VERSION:oecore_update_siteconf \ " -SANITY_DIFF_TOOL ?= "meld" +SANITY_DIFF_TOOL ?= "diff -u" SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" python oecore_update_localconf() { -- cgit v1.2.3-54-g00ecf