From 065ca47c7af1861cba3245477d29c25faadf6f9d Mon Sep 17 00:00:00 2001 From: Lei YU Date: Thu, 10 Jun 2021 16:01:54 +0800 Subject: Install obmc-mapper.target from obmc-targets package The obmc-mapper.target was installed by phosphor-state-manager package. It works fine if phosphor-state-manager is installed. Unfortunately, x86 systems typically uses x86-power-control instead of phosphor-state-manager to implement the state manager, and the obmc-mapper.target is missing there. So a system with x86-power-control does not have a valid obmc-mapper.target, and the services depdend on the target will be started in unexpected order. The obmc-mapper.target is really a common target, let obmc-targets.bb install it. Tested: Verify the g220a build has a valid obmc-mapper.target and the phosphor-virtual-sensor service starts after the target. Also verify the targets in phosphor-state-manager are not installed. Signed-off-by: Lei YU Change-Id: Idb069385a6c6c7add5331a1bf3efc0babc005d62 --- meta-phosphor/recipes-core/systemd/obmc-targets.bb | 11 +++++++++-- .../recipes-core/systemd/obmc-targets/obmc-mapper.target | 4 ++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target (limited to 'meta-phosphor/recipes-core/systemd') diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/recipes-core/systemd/obmc-targets.bb index 2ab0c22c6..a95535e85 100644 --- a/meta-phosphor/recipes-core/systemd/obmc-targets.bb +++ b/meta-phosphor/recipes-core/systemd/obmc-targets.bb @@ -5,5 +5,12 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -# TODO Will be removed once dependencies in other layers on this recipe are moved -DEPENDS += "phosphor-state-manager" +inherit allarch obmc-phosphor-systemd + +SRC_URI += "\ + file://obmc-mapper.target \ +" + +SYSTEMD_SERVICE_${PN} += " \ + obmc-mapper.target \ +" diff --git a/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target new file mode 100644 index 000000000..5e52f4cd5 --- /dev/null +++ b/meta-phosphor/recipes-core/systemd/obmc-targets/obmc-mapper.target @@ -0,0 +1,4 @@ +[Unit] +Description=Phosphor Object Mapper +RefuseManualStart=yes +RefuseManualStop=yes -- cgit v1.2.3