[oe][meta-networking][PATCH] mctp: upgrade 2.6 -> 2.7

[oe][meta-networking][PATCH] mctp: upgrade 2.6 -> 2.7

[James Lee]

mctp version 2.7 adds Meson's installation tags to the project, now allowing
binaries to be selectively installed.

Use MESON_INSTALL_TAGS to selectively install files specific to each recipe.
No longer rm in mctpd's do_install step, which was a now-unneeded hack.
Meson tags prevent installation of the extra binaries.

Add mctpd.conf to FILES in the mctpd recipe following its installation to
improve recipe readability.

Signed-off-by: James Lee <james@codeconstruct.com.au>
---
 meta-networking/recipes-support/mctp/mctp.inc         |  2 +-
 .../recipes-support/mctp/{mctp_2.6.bb => mctp_2.7.bb} |  1 +
 .../mctp/{mctpd_2.6.bb => mctpd_2.7.bb}               | 11 +++--------
 3 files changed, 5 insertions(+), 9 deletions(-)
 rename meta-networking/recipes-support/mctp/{mctp_2.6.bb => mctp_2.7.bb} (80%)
 rename meta-networking/recipes-support/mctp/{mctpd_2.6.bb => mctpd_2.7.bb} (73%)

diff --git a/meta-networking/recipes-support/mctp/mctp.inc b/meta-networking/recipes-support/mctp/mctp.inc
index c8fc98f63a..05a09f6c70 100644
--- a/meta-networking/recipes-support/mctp/mctp.inc
+++ b/meta-networking/recipes-support/mctp/mctp.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4cc91856b08b094b4f406a29dc61db21"
 
 SRC_URI = "git://github.com/CodeConstruct/mctp;branch=main;protocol=https;tag=v${PV}"
-SRCREV = "31ac0e86b0e23d32abf34d191653a87a47f3c9a7"
+SRCREV = "eca0e9a7f87ed478be206e4f52bcd51561da18aa"
 
 inherit meson pkgconfig
 
diff --git a/meta-networking/recipes-support/mctp/mctp_2.6.bb b/meta-networking/recipes-support/mctp/mctp_2.7.bb
similarity index 80%
rename from meta-networking/recipes-support/mctp/mctp_2.6.bb
rename to meta-networking/recipes-support/mctp/mctp_2.7.bb
index 5811495c66..6d2a401716 100644
--- a/meta-networking/recipes-support/mctp/mctp_2.6.bb
+++ b/meta-networking/recipes-support/mctp/mctp_2.7.bb
@@ -3,3 +3,4 @@ require mctp.inc
 SUMMARY = "Management Component Transport Protocol (MCTP) utilities"
 
 MESON_TARGET = "mctp mctp-client"
+MESON_INSTALL_TAGS += "utils"
diff --git a/meta-networking/recipes-support/mctp/mctpd_2.6.bb b/meta-networking/recipes-support/mctp/mctpd_2.7.bb
similarity index 73%
rename from meta-networking/recipes-support/mctp/mctpd_2.6.bb
rename to meta-networking/recipes-support/mctp/mctpd_2.7.bb
index 139865d7c4..b8b3719c9e 100644
--- a/meta-networking/recipes-support/mctp/mctpd_2.6.bb
+++ b/meta-networking/recipes-support/mctp/mctpd_2.7.bb
@@ -4,6 +4,8 @@ SUMMARY = "Management Component Transport Protocol (MCTP) control protocol daemo
 
 inherit systemd features_check useradd
 
+MESON_INSTALL_TAGS += "mctpd"
+
 do_install:append () {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${S}/conf/mctpd.service \
@@ -14,6 +16,7 @@ do_install:append () {
     install -m 0644 ${S}/conf/mctpd-dbus.conf \
             ${D}${datadir}/dbus-1/system.d/mctpd.conf
 }
+FILES:${PN} += "${datadir}/dbus-1/system.d/mctpd.conf"
 
 SYSTEMD_SERVICE:${PN} = "mctpd.service mctp.target mctp-local.target"
 
@@ -22,11 +25,3 @@ USERADD_PARAM:${PN} = "-r -U -s /bin/false mctpd"
 
 DEPENDS += "systemd"
 REQUIRED_DISTRO_FEATURES = "systemd"
-
-# Meson adds mctp utility binaries to FILES and do_install(), which cannot be
-# overriden by MESON_TARGET. Override FILES and remove binaries to correct.
-FILES:${PN} = "${datadir}/dbus-1/system.d/mctpd.conf ${sbindir}/mctpd"
-
-do_install:append () {
-    rm -r ${D}${bindir}
-}
-- 
2.47.3