From 31a2c552c067b8094028c4532fb52c9a299d5f6d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Wed, 15 Jan 2020 13:10:29 -0600 Subject: recipe does not need to install json file As noted in this review: https://gerrit.openbmc-project.xyz/c/openbmc/meta-phosphor/+/27903/6/recipes-phosphor/state/phosphor-state-manager_git.bb#146 meson handles the installation of the json file for you so the do_install_append section is no longer needed. Tested: Built image and verified json file was still in correct location within QEMU. (From meta-phosphor rev: 779f11d8b90e6829b2ec68311b2aa4f64c1adcef) Change-Id: I7b16ad5fba1694d80d51bf915233f4eeab426d39 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 5 ----- 1 file changed, 5 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/state') diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 2f3ceb609..674add7b1 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -140,11 +140,6 @@ HOST_RST_RBT_ATTEMPTS_SVC_INST = "phosphor-reset-host-reboot-attempts@{0}.servic HOST_RST_RBT_ATTEMPTS_SVC_FMT = "../${HOST_RST_RBT_ATTEMPTS_SVC}:${HOST_START_TGTFMT}.requires/${HOST_RST_RBT_ATTEMPTS_SVC_INST}" SYSTEMD_LINK_${PN}-host += "${@compose_list_zip(d, 'HOST_RST_RBT_ATTEMPTS_SVC_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_HOST_INSTANCES')}" -do_install_append() { - install -d ${D}${sysconfdir}/phosphor-systemd-target-monitor - install ${S}/data/phosphor-target-monitor-default.json ${D}${sysconfdir}/phosphor-systemd-target-monitor/phosphor-target-monitor-default.json -} - SRC_URI += "git://github.com/openbmc/phosphor-state-manager" SRCREV = "4640d48e998709f1b64b97347db0f1b355b7f423" -- cgit v1.2.3