From 8623bbe4d4a187018cc3c265aaca5fa05b78d13b Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 9 Mar 2018 00:04:00 -0500 Subject: Convert obmc-ubi-fs to a distro feature As with MRW the use of the UBI image scheme is distro policy. Convert the existing machine feature to a distro feature. Enable the new distro feature on the systems that use it(Witherspoon). Add a distro override and fix-up MF checks to use this override instead for improved readability. Tested: Built a Witherspoon image and validated image Change-Id: I8ab03115bbfc2ecc77cff5c9eb8628903ae88051 Signed-off-by: Brad Bishop --- meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend') diff --git a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend index e632d563c..172c9a5e1 100644 --- a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend +++ b/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend @@ -1,8 +1,8 @@ inherit obmc-phosphor-utils -FILESEXTRAPATHS_prepend := "${@mf_enabled(d, 'obmc-ubi-fs', '${THISDIR}/${PN}:')}" +FILESEXTRAPATHS_prepend_df-obmc-ubi-fs := "${THISDIR}/${PN}:" -RDEPENDS_${PN}_append += "${@mf_enabled(d, 'obmc-ubi-fs', 'preinit-mounts')}" +RDEPENDS_${PN}_append_df-obmc-ubi-fs = " preinit-mounts" do_install_append() { install -d ${D}/srv -- cgit v1.2.3