| Message ID | 20240407170947.2078302-1-raj.khem@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | d027236eac2a136b06903d4a47adbc50ccd6b7c6 |
| Headers | show |
| Series | sanity: Use diff instead of meld by default | expand |
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() {
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> --- meta/classes-global/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)