diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-08-30 13:51:23 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-08-31 08:30:19 -0700 |
commit | 7de0bbbbaa5064dbb72db769060a7a93ccf2d654 (patch) | |
tree | 2f77fe87f67b74836db6a36fc4eb07db45174484 /meta-oe | |
parent | 874a6c7a994c5ed8753fa51d746ccc5dc10d176c (diff) | |
download | meta-openembedded-7de0bbbbaa5064dbb72db769060a7a93ccf2d654.tar.gz |
canutils: Use update-alternatives
canutils provides applications which conflict with can-utils recipe.
update-alternatives helps fix this when both are installed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-extended/socketcan/can-utils_git.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/meta-oe/recipes-extended/socketcan/can-utils_git.bb index 519368817fd..e3ad04f5980 100644 --- a/meta-oe/recipes-extended/socketcan/can-utils_git.bb +++ b/meta-oe/recipes-extended/socketcan/can-utils_git.bb @@ -12,4 +12,8 @@ PV = "2020.02.04" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig update-alternatives + +ALTERNATIVE_${PN} = "candump cansend" +ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" +ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb index e1508af8578..aaa26534832 100644 --- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb +++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb @@ -12,9 +12,16 @@ SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git \ file://0001-canutils-candump-Add-error-frame-s-handling.patch \ " +inherit update-alternatives + S = "${WORKDIR}/git" inherit autotools pkgconfig # Busybox ip doesn't support can interface configuration, use the real thing RDEPENDS_${PN} += "iproute2" + +ALTERNATIVE_PRIORITY = "90" +ALTERNATIVE_${PN} = "candump cansend" +ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump" +ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend" |