]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
sanity: Use diff instead of meld by default
authorKhem Raj <raj.khem@gmail.com>
Sun, 7 Apr 2024 17:09:47 +0000 (10:09 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 11 Apr 2024 07:55:21 +0000 (08:55 +0100)
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>
meta/classes-global/sanity.bbclass

index bbbc41ddae959ee3669cdcc2de5bcea9b5cbc2bc..180c6b77d8baf02fa2b0524737003c94561786c3 100644 (file)
@@ -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() {