From 98536be8d1a5dcf620ee6d07135f23126a09d98f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 17 Dec 2018 22:56:20 +0000 Subject: defaultsetup: Include maintainers.inc by default There is little harm in including this file rather than having a rather obscure and soon to be obsolete bbclass adding this information. Signed-off-by: Richard Purdie --- meta/classes/distrodata.bbclass | 1 - meta/conf/distro/defaultsetup.conf | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 59ee8cea66..c0d698febb 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -1,6 +1,5 @@ include conf/distro/include/upstream_tracking.inc include conf/distro/include/distro_alias.inc -include conf/distro/include/maintainers.inc addhandler distro_eventhandler distro_eventhandler[eventmask] = "bb.event.BuildStarted" diff --git a/meta/conf/distro/defaultsetup.conf b/meta/conf/distro/defaultsetup.conf index ca2f9178d2..20e61232e9 100644 --- a/meta/conf/distro/defaultsetup.conf +++ b/meta/conf/distro/defaultsetup.conf @@ -2,6 +2,7 @@ include conf/distro/include/default-providers.inc include conf/distro/include/default-versions.inc include conf/distro/include/default-distrovars.inc include conf/distro/include/world-broken.inc +include conf/distro/include/maintainers.inc TCMODE ?= "default" require conf/distro/include/tcmode-${TCMODE}.inc -- cgit 1.2.3-korg