From 194ff4f1f5d44b12e9cb06ddafa6adb20174a13c Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Wed, 22 Aug 2018 21:40:54 -0400 Subject: [Subtree] Bring openbmc machines to top level The new subtree model brings the subtrees up from the openbmc-machines layer. Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0 Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- meta-phosphor/conf/bblayers.conf.sample | 2 +- meta-phosphor/conf/distro/include/phosphor-base.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-phosphor/conf') diff --git a/meta-phosphor/conf/bblayers.conf.sample b/meta-phosphor/conf/bblayers.conf.sample index 7d9607dbe..559f3bfbf 100644 --- a/meta-phosphor/conf/bblayers.conf.sample +++ b/meta-phosphor/conf/bblayers.conf.sample @@ -1,6 +1,6 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "7" +LCONF_VERSION = "8" BBPATH = "${TOPDIR}" BBFILES ?= "" diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 9edd238be..1908118c1 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -154,3 +154,4 @@ SKIP_META_VIRT_SANITY_CHECK = "1" # make sense on a BMC anyway. BAD_RECOMMENDATIONS_pn-obmc-phosphor-image = "udev-hwdb" +LAYER_CONF_VERSION = "8" -- cgit v1.2.3