From fdcb2d914176c4a3d54af9464c90d6f689ce6577 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 18 Oct 2019 11:04:05 -0500 Subject: stop overriding DISTRO_FEATURES in phosphor-base Other include files may set DISTRO_FEATURES prior to including this file. Need to honor those features. (From meta-phosphor rev: 17801b40a7143c6b80dd4318c94143e47ef1ead3) Change-Id: I42593e07d67416d2dbb06f3958861ed4ebe762ff Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/conf/distro/include/phosphor-base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/conf') diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 2a9301d76..20fd21643 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -113,7 +113,7 @@ DISTRO_FEATURES_DEFAULT = " \ libc-inet-anl \ " -DISTRO_FEATURES = " \ +DISTRO_FEATURES += " \ ${DISTRO_FEATURES_DEFAULT} \ ${DISTRO_FEATURES_LIBC} \ ${DISTRO_FEATURES_OBMC} \ -- cgit v1.2.3