summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-17 22:56:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-18 16:19:29 +0000
commit98536be8d1a5dcf620ee6d07135f23126a09d98f (patch)
tree087bdff3a8d00ad7214ead5d91d37b45bb153277
parent59be9254df9ffeda594b21af8be433564c898474 (diff)
downloadopenembedded-core-contrib-98536be8d1a5dcf620ee6d07135f23126a09d98f.tar.gz
openembedded-core-contrib-98536be8d1a5dcf620ee6d07135f23126a09d98f.tar.bz2
openembedded-core-contrib-98536be8d1a5dcf620ee6d07135f23126a09d98f.zip
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>
-rw-r--r--meta/classes/distrodata.bbclass1
-rw-r--r--meta/conf/distro/defaultsetup.conf1
2 files changed, 1 insertions, 1 deletions
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