mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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>
This commit is contained in:
parent
9f75f4add5
commit
ca93c215fd
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue
Block a user