From 6abe6742cd662ac2d0774285ba00055c49ef62f3 Mon Sep 17 00:00:00 2001 From: George Liu Date: Fri, 25 Dec 2020 09:16:56 +0800 Subject: meta-inspur: add com/ibm to OBMC_ORG_YAML_SUBDIRS Since inspur/fp5280g2 machine built requires `xyz/openbmc_project`, `org/open_power` and `com/ibm`. 1. `xyz / openbmc_project` is built by default in phosphor-dbus-interfaces repo. 2. `org/open_power` has been added to `meta-openpower/conf/distro/include/openpower-distrovars.inc`. 3. Need to add the `com/ibm` to OBMC_ORG_YAML_SUBDIRS in the inspur layer and require it in fp5280g2.conf. Tested: Built fp5280g2 and ran successfully. (From meta-inspur rev: 8427a0acfa3a9b2b397e72808999db9bccdd428f) Signed-off-by: George Liu Change-Id: Idbed3f012d7c754752757b7b75496b743efbb3aa Signed-off-by: Andrew Geissler --- meta-inspur/conf/distro/include/inspur-distrovars.inc | 1 + meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf | 1 + 2 files changed, 2 insertions(+) create mode 100644 meta-inspur/conf/distro/include/inspur-distrovars.inc (limited to 'meta-inspur') diff --git a/meta-inspur/conf/distro/include/inspur-distrovars.inc b/meta-inspur/conf/distro/include/inspur-distrovars.inc new file mode 100644 index 000000000..dde13f233 --- /dev/null +++ b/meta-inspur/conf/distro/include/inspur-distrovars.inc @@ -0,0 +1 @@ +OBMC_ORG_YAML_SUBDIRS += " com/ibm" diff --git a/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf index 854e0fb7b..de0682cf6 100644 --- a/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf +++ b/meta-inspur/meta-fp5280g2/conf/distro/openbmc-fp5280g2.conf @@ -1,2 +1,3 @@ require conf/distro/openbmc-openpower.conf require conf/distro/include/phosphor-aspeednic-use-mac2.inc +require conf/distro/include/inspur-distrovars.inc -- cgit v1.2.3