diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-04-07 10:09:47 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-11 08:55:24 +0100 |
| commit | ca93c215fdd2e0f3b0ab4a205ccf80e5077e5d06 (patch) | |
| tree | 327b62fee4d6f88cbb777f77d95d49aeb448026a /meta/classes-global | |
| parent | 9f75f4add516f9089f8a2668b7c2f79cbb316aea (diff) | |
| download | poky-ca93c215fdd2e0f3b0ab4a205ccf80e5077e5d06.tar.gz | |
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 <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-global')
| -rw-r--r-- | meta/classes-global/sanity.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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 += " \ | |||
| 40 | conf/site.conf:SCONF_VERSION:SITE_CONF_VERSION:oecore_update_siteconf \ | 40 | conf/site.conf:SCONF_VERSION:SITE_CONF_VERSION:oecore_update_siteconf \ |
| 41 | " | 41 | " |
| 42 | 42 | ||
| 43 | SANITY_DIFF_TOOL ?= "meld" | 43 | SANITY_DIFF_TOOL ?= "diff -u" |
| 44 | 44 | ||
| 45 | SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" | 45 | SANITY_LOCALCONF_SAMPLE ?= "${COREBASE}/meta*/conf/templates/default/local.conf.sample" |
| 46 | python oecore_update_localconf() { | 46 | python oecore_update_localconf() { |