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 --- .../common/recipes-core/base-files/base-files_%.bbappend | 4 ++-- meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta-phosphor/common/recipes-core') 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 diff --git a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend index 3b8a8d934..e7eeb5a5a 100644 --- a/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/common/recipes-core/systemd/systemd_%.bbappend @@ -22,7 +22,7 @@ PACKAGECONFIG[journald-dbus] = "--enable-journald-dbus,--disable-journald-dbus" FILES_${PN} += "${datadir}/dbus-1/system.d/org.freedesktop.journal1.conf" SRC_URI += "file://0007-journal-Add-Synchronize-dbus-method.patch" -SRC_URI += "${@mf_enabled(d, 'obmc-ubi-fs', 'file://software.conf')}" +SRC_URI_append_df-obmc-ubi-fs = " file://software.conf" SRC_URI += "file://0008-man-update-machine-id-5-with-a-note-about-privacy-46.patch" SRC_URI += "file://0009-sd-id128-add-new-sd_id128_get_machine_app_specific-A.patch" SRC_URI += "file://0010-core-add-khash-API-to-src-basic-as-wrapper-around-ke.patch" @@ -40,11 +40,11 @@ do_install_append() { #TODO Remove after this issue is resolved #https://github.com/openbmc/openbmc/issues/152 ln -s /dev/null ${D}/etc/systemd/system/systemd-hwdb-update.service +} +do_install_append_df-obmc-ubi-fs() { # /tmp/images is the software image upload directory. # It should not be deleted since it is watched by the Image Manager # for new images. - if ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', 'true', 'false', d)}; then - install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/ - fi + install -m 0644 ${WORKDIR}/software.conf ${D}${exec_prefix}/lib/tmpfiles.d/ } -- cgit v1.2.1