From 102a8b5ab3214cd30de5875f9402779cfa63ec4b Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 26 Oct 2018 12:05:03 -0400 Subject: phosphor: distro: fix up uninative removal At present we do not enable the uninative feature because a number of our build systems are powerpc64le; there isn't any published uninative tarball for powerpc64le and it isn't clear if uninative works on non x86 platforms. None of that changes with this patch, but the method in which it is removed is...odd - first it is enabled in the usual way but then later in the distro config it is turned back off. Refactor and just don't turn it on in the first place. Note that derivative distros can enable uninative if they don't have any dependency on non x86 build hosts. (From meta-phosphor rev: 70e685ef45a926064d27a2937d6274832c7608b4) Change-Id: If2e343cb79529d1b888289feccd489e151e5a7a8 Signed-off-by: Brad Bishop --- meta-phosphor/conf/distro/include/phosphor-base.inc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'meta-phosphor/conf/distro') diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index b9f563677..abb4178cb 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -76,8 +76,6 @@ ERROR_QA_append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/poky-world-exclude.inc require conf/distro/include/no-static-libs.inc -require conf/distro/include/yocto-uninative.inc -INHERIT += "uninative" DISTRO = "openbmc-phosphor" DISTRO_NAME = "Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" @@ -138,8 +136,6 @@ PREFERRED_VERSION_python-pygobject = "2.%" include conf/distro/include/openbmc-phosphor/${MACHINE}.inc -INHERIT_remove = " uninative" - KERNEL_FEATURES_append = " phosphor-gpio-keys" KERNEL_FEATURES_remove_qemuall = " phosphor-gpio-keys" -- cgit v1.2.3