From 645a895a7f4d12c574ae6b9483956425219b6fe4 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 1 Apr 2021 18:54:43 +0000 Subject: ibm: Remove the openbmc-witherspoon distro The meta-ibm layer supported two different DISTROs depending on the machine being built. This caused complexity since the user needed to remember to specify the DISTRO name, in addition to the CI build scripts needed to check for the machine name being built to override the default DISTRO. For simplification, remove the openbmc-witherspoon DISTRO, which is the openpower DISTRO plus additional features, and move these features to the machine configuration files. Make the openpower DISTRO the default. Tested: Built witherspoon and p10bmc using "source setup build" followed by "bitbake obmc-phosphor-image" without specifying the DISTRO. Verified witherspoon built a ubi image and p10bmc built a emmc image. Change-Id: If33441ab4ad2dc0fbedde09f0db91d691d2da4f7 Signed-off-by: Adriana Kobylak --- meta-ibm/conf/distro/openbmc-witherspoon.conf | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 meta-ibm/conf/distro/openbmc-witherspoon.conf (limited to 'meta-ibm/conf/distro/openbmc-witherspoon.conf') diff --git a/meta-ibm/conf/distro/openbmc-witherspoon.conf b/meta-ibm/conf/distro/openbmc-witherspoon.conf deleted file mode 100644 index f2caf402b..000000000 --- a/meta-ibm/conf/distro/openbmc-witherspoon.conf +++ /dev/null @@ -1,4 +0,0 @@ -require conf/distro/openbmc-openpower.conf -require conf/distro/include/phosphor-ubi.inc -require conf/distro/include/openpower-mrw.inc -require conf/distro/include/openpower-ubi.inc -- cgit v1.2.3