Skip to contentSkip to conversation

sanity: Use diff instead of meld by default

PATCH New Khem Raj 1 participant 1 message Apr 7, 2024

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 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

---
 meta/classes-global/sanity.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-global/sanity.bbclass +1 -1
index bbbc41ddae9..180c6b77d8b 100644
@@ -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() {
Signature · 1 line
2.44.0