diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-22 23:54:16 +0300 |
| commit | 9722c6ee87766a45a337c094d1293de81cdcb106 (patch) | |
| tree | 08b57716ae3c02fef2bc870b634019e692fd70e6 /poky/meta/conf/distro/defaultsetup.conf | |
| parent | 35e295e2a161fcf146ea031de53431b2888521fa (diff) | |
| parent | 5b6cc97bf138293b6af12d5d3003bb66c700c48a (diff) | |
| download | openbmc-9722c6ee87766a45a337c094d1293de81cdcb106.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into HEAD
Diffstat (limited to 'poky/meta/conf/distro/defaultsetup.conf')
| -rw-r--r-- | poky/meta/conf/distro/defaultsetup.conf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/poky/meta/conf/distro/defaultsetup.conf b/poky/meta/conf/distro/defaultsetup.conf index 20e61232e..66fd24652 100644 --- a/poky/meta/conf/distro/defaultsetup.conf +++ b/poky/meta/conf/distro/defaultsetup.conf @@ -1,7 +1,6 @@ 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" @@ -23,3 +22,6 @@ PACKAGE_CLASSES ?= "package_ipk" INHERIT_BLACKLIST = "blacklist" INHERIT_DISTRO ?= "debian devshell sstate license remove-libtool" INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST}" + +INIT_MANAGER ??= "none" +require conf/distro/include/init-manager-${INIT_MANAGER}.inc |