summaryrefslogtreecommitdiff
path: root/meta-alibaba
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2021-02-20 02:13:35 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-04-12 21:51:03 +0300
commit830ca604fe9896aafade07e93416ae058cc2e6ad (patch)
tree276ef0896c8a1402d8b7ed0e4e4da5e73742842d /meta-alibaba
parent39c9d3d1bbd05b16016ec6f8044dea8e60d96aff (diff)
downloadopenbmc-830ca604fe9896aafade07e93416ae058cc2e6ad.tar.xz
alibaba-thor: remove empty distro indirection
Most openbmc machines use DISTRO="openbmc-phosphor" but Thor has a "alibaba-openbmc" distro config file. This config file has nothing except an inclusion of the phosphor one, so remove this useless indirection. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I9d4038c7bd58112fe9f2396c71f9bbd285b148bf
Diffstat (limited to 'meta-alibaba')
-rw-r--r--meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf1
-rw-r--r--meta-alibaba/meta-thor/conf/local.conf.sample4
2 files changed, 2 insertions, 3 deletions
diff --git a/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf b/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf
deleted file mode 100644
index de15fbcc6b..0000000000
--- a/meta-alibaba/meta-thor/conf/distro/alibaba-openbmc.conf
+++ /dev/null
@@ -1 +0,0 @@
-require conf/distro/include/phosphor-base.inc
diff --git a/meta-alibaba/meta-thor/conf/local.conf.sample b/meta-alibaba/meta-thor/conf/local.conf.sample
index 09c441fee1..fbae84b73d 100644
--- a/meta-alibaba/meta-thor/conf/local.conf.sample
+++ b/meta-alibaba/meta-thor/conf/local.conf.sample
@@ -58,9 +58,9 @@ DL_DIR ?= "${TOPDIR}/../downloads"
# Ultimately when creating custom policy, people will likely end up subclassing
# these defaults.
#
-DISTRO ?= "alibaba-openbmc"
+DISTRO ?= "openbmc-phosphor"
# As an example of a subclass there is a "bleeding" edge policy configuration
-# where many versions are set to the absolute latest code from the upstream
+# where many versions are set to the absolute latest code from the upstream
# source control systems. This is just mentioned here as an example, its not
# useful to most new users.
# DISTRO ?= "poky-bleeding"