From d0f63ef62c76c932a2003eaa42c0b250065ae06f Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 31 Jul 2019 10:43:37 -0700 Subject: Update to internal 7-31-19 Signed-off-by: Ed Tanous --- .../entity-manager/xyz.openbmc_project.CloseMuxes.service | 10 ---------- .../recipes-phosphor/configuration/entity-manager_%.bbappend | 12 +----------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/xyz.openbmc_project.CloseMuxes.service (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/configuration') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/xyz.openbmc_project.CloseMuxes.service b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/xyz.openbmc_project.CloseMuxes.service deleted file mode 100644 index bc05fa1a1..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/xyz.openbmc_project.CloseMuxes.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Close Muxes -ConditionFileNotEmpty=/usr/bin/CloseMuxes.py - -[Service] -ExecStart=/usr/bin/env CloseMuxes.py -Type=oneshot - -[Install] -WantedBy=basic.target diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend index 8b9da74f0..d4b50df88 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -1,18 +1,8 @@ # this is here just to bump faster than upstream SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "15c49902cf030a91a5b4bd325d185ee74b760359" +SRCREV = "441c7a86749b2331863b115e141033e735bd6ffc" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -RDEPENDS_${PN} += "python" -SRC_URI += " file://xyz.openbmc_project.CloseMuxes.service" -SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.CloseMuxes.service" - EXTRA_OECMAKE = "-DYOCTO=1 -DUSE_OVERLAYS=0" -do_install_prepend() { - install -d ${D}${bindir} - install -m 0755 ${S}/scripts/CloseMuxes.py ${D}${bindir} - install -d ${D}${base_libdir}/systemd/system - install -m 0644 ${WORKDIR}/xyz.openbmc_project.CloseMuxes.service ${D}${base_libdir}/systemd/system -} -- cgit v1.2.3