libmctp: Drop 'astlpc-raw-kcs' PACKAGECONFIG option
Earlier the 'astlpc-raw-kcs' PACKAGECONFIG option was used to populate
udev rules from the 'libmctp' repository to the system.
Now udev rules are dropped from the repo in favor of a KCS device path
argument provided via 'mctp' configuration file.
Correct recipe file and all the affected platforms to this new
approach.
libmctp: srcrev bump 8803dc12a9..400766f943
Konstantin Aladyshev (1):
astlpc: Provide KCS device path as a binding argument
Change-Id: I480fe1f9d211dca6db29fbedb7836d469ad2ee02
Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Signed-off-by: Andrew Geissler <openbmcbump-github@yahoo.com>
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp b/meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp
index f906220..6bf4409 100644
--- a/meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp
+++ b/meta-ibm/recipes-phosphor/libmctp/files/p10bmc/mctp
@@ -1 +1 @@
-DEMUX_BINDING_OPTS=astlpc
+DEMUX_BINDING_OPTS=astlpc /dev/raw-kcs3
diff --git a/meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp b/meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp
index f906220..6bf4409 100644
--- a/meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp
+++ b/meta-ibm/recipes-phosphor/libmctp/files/witherspoon-tacoma/mctp
@@ -1 +1 @@
-DEMUX_BINDING_OPTS=astlpc
+DEMUX_BINDING_OPTS=astlpc /dev/raw-kcs3
diff --git a/meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend
index e69ed5c..989f1b0 100644
--- a/meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend
+++ b/meta-ibm/recipes-phosphor/libmctp/libmctp_%.bbappend
@@ -2,6 +2,3 @@
SRC_URI:append:p10bmc = " file://mctp"
SRC_URI:append:witherspoon-tacoma = " file://mctp"
-
-PACKAGECONFIG:append:p10bmc = " astlpc-raw-kcs"
-PACKAGECONFIG:append:witherspoon-tacoma = " astlpc-raw-kcs"
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp/mctp b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp/mctp
index 2d5f246..63944b8 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp/mctp
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp/mctp
@@ -1,2 +1,2 @@
-DEMUX_BINDING_OPTS=astlpc
+DEMUX_BINDING_OPTS=astlpc /dev/raw-kcs3
diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend
index 5418cd7..9add5fb 100644
--- a/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend
+++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/libmctp/libmctp_%.bbappend
@@ -2,8 +2,6 @@
SRC_URI += "file://mctp"
-PACKAGECONFIG:append:fp5280g2 = " astlpc-raw-kcs"
-
do_install:append() {
install -m 0644 ${WORKDIR}/mctp ${D}${sysconfdir}/default/mctp
}
diff --git a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb
index aff9313..dc1279d 100644
--- a/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb
+++ b/meta-phosphor/recipes-phosphor/libmctp/libmctp_git.bb
@@ -6,11 +6,10 @@
DEPENDS += "autoconf-archive-native \
systemd \
"
-SRCREV = "8803dc12a969480e2efc41677bef15196cb3b0b9"
+SRCREV = "400766f94322a00981b012e714734cab0ed52e68"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} pcap"
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}, \
--without-systemdsystemunitdir,systemd"
-PACKAGECONFIG[astlpc-raw-kcs] = "--enable-astlpc-raw-kcs,--disable-astlpc-raw-kcs,udev,udev"
PACKAGECONFIG[pcap] = "--enable-capture,--disable-capture,libpcap,"
PV = "1.0+git${SRCPV}"
PR = "r1"