From 188d34f967f4d6d62f22ad4a2b862ae8db1ac89c Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 20 Apr 2020 18:02:54 -0500 Subject: distro: do not override DISTRO in base inc This file originally was not written to be included. Once it was moved to an include, should have removed the DISTRO override. The gsj system recently moved to a custom distro that includes this file. Need to ensure DISTRO is not overridden. (From meta-phosphor rev: 15269544861c755661981d99711c120fce5410cd) Change-Id: Iab75967dcaddf0d86b47d4339d82cce43197e73a Signed-off-by: Andrew Geissler --- meta-phosphor/conf/distro/include/phosphor-base.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 86cc54ca9..31e669b65 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -74,7 +74,6 @@ ERROR_QA_append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/no-static-libs.inc require conf/distro/include/yocto-uninative.inc -DISTRO = "openbmc-phosphor" DISTRO_NAME = "Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" DISTRO_VERSION = "0.1.0" TARGET_VENDOR="-openbmc" -- cgit v1.2.3