diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-17 22:56:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-18 16:19:34 +0000 |
commit | be4d74c509400b08b1c62faf849fcba24146a06d (patch) | |
tree | 75d6bd9df57f7ba014628a2a6ec3cb0f0ea516f2 | |
parent | 195c763eff990cd6d45813ba56005bd3e5dda5ba (diff) | |
download | poky-be4d74c509400b08b1c62faf849fcba24146a06d.tar.gz |
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.
(From OE-Core rev: 98536be8d1a5dcf620ee6d07135f23126a09d98f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/distrodata.bbclass | 1 | ||||
-rw-r--r-- | meta/conf/distro/defaultsetup.conf | 1 |
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 @@ | |||
1 | include conf/distro/include/upstream_tracking.inc | 1 | include conf/distro/include/upstream_tracking.inc |
2 | include conf/distro/include/distro_alias.inc | 2 | include conf/distro/include/distro_alias.inc |
3 | include conf/distro/include/maintainers.inc | ||
4 | 3 | ||
5 | addhandler distro_eventhandler | 4 | addhandler distro_eventhandler |
6 | distro_eventhandler[eventmask] = "bb.event.BuildStarted" | 5 | 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 | |||
2 | include conf/distro/include/default-versions.inc | 2 | include conf/distro/include/default-versions.inc |
3 | include conf/distro/include/default-distrovars.inc | 3 | include conf/distro/include/default-distrovars.inc |
4 | include conf/distro/include/world-broken.inc | 4 | include conf/distro/include/world-broken.inc |
5 | include conf/distro/include/maintainers.inc | ||
5 | 6 | ||
6 | TCMODE ?= "default" | 7 | TCMODE ?= "default" |
7 | require conf/distro/include/tcmode-${TCMODE}.inc | 8 | require conf/distro/include/tcmode-${TCMODE}.inc |