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 <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 59ee8cea660fa7d53e4530bfd962ca789c05a707..c0d698febbd5e0806a2efc2273b1df31023cdac3 100644 (file)
--- 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 ca2f9178d2e0860a9a636c1b6721ddd2d293226d..20e61232e978e96e3955a2f865f22ee293912384 100644 (file)
--- 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