From c233b005ac166e27a21e9c1267367d063d7cd80a Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Tue, 9 Oct 2018 20:20:36 -0700 Subject: meta-phosphor: host: obmc-op-control-host: rename as git obmc-op-control-host.bb inherits skeleton-gdbus, which is git-based. (From meta-phosphor rev: 6188642272fa7cc4282421f8585329ceed4d8d04) Change-Id: I9e2a37cbacc3141c429c1b09d7c25b5c875ae953 Signed-off-by: Patrick Venture Signed-off-by: Brad Bishop --- .../recipes-phosphor/host/obmc-op-control-host.bb | 25 --------------------- .../host/obmc-op-control-host_git.bb | 26 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb create mode 100644 meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb diff --git a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb deleted file mode 100644 index 627f75956..000000000 --- a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "org.openbmc.control.Host implementation for OpenPOWER" -DESCRIPTION = "A host control implementation suitable for OpenPOWER systems." -PR = "r1" - -inherit skeleton-gdbus -inherit obmc-phosphor-dbus-service -inherit pkgconfig - -PROVIDES += "virtual/obmc-host-ctl" -RPROVIDES_${PN} += "virtual-obmc-host-ctl" - -SKELETON_DIR = "op-hostctl" - -FMT = "org.openbmc.control.Host@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE_${PN} = " \ - op-start-host@.service \ - " - -START_TMPL = "op-start-host@.service" -START_TGTFMT = "obmc-host-startmin@{1}.target" -START_INSTFMT = "op-start-host@{0}.service" -START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" - -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb new file mode 100644 index 000000000..81b51394c --- /dev/null +++ b/meta-phosphor/recipes-phosphor/host/obmc-op-control-host_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "org.openbmc.control.Host implementation for OpenPOWER" +DESCRIPTION = "A host control implementation suitable for OpenPOWER systems." +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit skeleton-gdbus +inherit obmc-phosphor-dbus-service +inherit pkgconfig + +PROVIDES += "virtual/obmc-host-ctl" +RPROVIDES_${PN} += "virtual-obmc-host-ctl" + +SKELETON_DIR = "op-hostctl" + +FMT = "org.openbmc.control.Host@{0}.service" +DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE_${PN} = " \ + op-start-host@.service \ + " + +START_TMPL = "op-start-host@.service" +START_TGTFMT = "obmc-host-startmin@{1}.target" +START_INSTFMT = "op-start-host@{0}.service" +START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}" + +SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT', 'OBMC_HOST_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}" -- cgit v1.2.1