From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 7 Apr 2024 17:09:47 +0000 (-0700)
Subject: sanity: Use diff instead of meld by default
X-Git-Tag: yocto-5.2~3232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d027236eac2a136b06903d4a47adbc50ccd6b7c6;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass
index bbbc41ddae9..180c6b77d8b 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() {