From debf2b5d689c9d308bc752f5aab3367c05152dc3 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 2 Sep 2021 13:20:09 +0800 Subject: meta-phosphor: rename mctp package to libmctp We're about to introduce a package for mctp utilities, called 'mctp'. However, the libmctp package already uses that name. This change renames 'mctp' to the upstream name of 'libmctp'. Signed-off-by: Jeremy Kerr Change-Id: Ia49a40c822e920d3bc36584cbc2c97b83828cfdd --- .../meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend | 10 ++++++++++ meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp | 2 ++ meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp | 2 -- .../meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend | 10 ---------- .../packagegroups/packagegroup-obmc-apps.bbappend | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend create mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp delete mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp delete mode 100644 meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend (limited to 'meta-inspur/meta-fp5280g2') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend new file mode 100644 index 0000000000..af2869b589 --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://mctp" + +PACKAGECONFIG:append:fp5280g2 = " astlpc-raw-kcs" + +do_install:append() { + install -d ${D}${sysconfdir}/default + install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp +} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp new file mode 100644 index 0000000000..2d5f2465ec --- /dev/null +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/mctp/mctp @@ -0,0 +1,2 @@ +DEMUX_BINDING_OPTS=astlpc + diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp deleted file mode 100644 index 2d5f2465ec..0000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp/mctp +++ /dev/null @@ -1,2 +0,0 @@ -DEMUX_BINDING_OPTS=astlpc - diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend deleted file mode 100644 index af2869b589..0000000000 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/mctp/mctp_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://mctp" - -PACKAGECONFIG:append:fp5280g2 = " astlpc-raw-kcs" - -do_install:append() { - install -d ${D}${sysconfdir}/default - install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp -} diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c6d0bd98df..dc8135f27b 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -17,7 +17,7 @@ RDEPENDS:${PN}-extras:append:fp5280g2 = " \ ${POWER_SERVICE_PACKAGES_FP5280G2} \ phosphor-led-manager \ pldm \ - mctp \ + libmctp \ phosphor-fp5280g2-psu-update \ phosphor-psu-software-manager \ biosconfig-manager \ -- cgit v1.2.3