summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2022-05-25 10:43:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-27 23:47:20 +0100
commit257e7620a79ea50c0c59746ff9a3817d43411e39 (patch)
tree4757587517331c017308c83b6bb78a3657554c45 /meta/recipes-bsp
parentda784aae3014d82039a5404d9b871b44ecd4aa52 (diff)
downloadopenembedded-core-contrib-257e7620a79ea50c0c59746ff9a3817d43411e39.tar.gz
pciutils: avoid lspci conflict with busybox
if virtualization is enabled as DISTRO_FEATURES, then meta-virtualization layer enables CONFIG_LSPCI=y for busybox, which in result have conflicts with pciutils update-alternatives: Error: not linking ..core-image-base/1.0-r0/rootfs/usr/bin/lspci to /bin/busybox.nosuid since ..core-image-base/1.0-r0/rootfs/usr/bin/lspci exists and is not a link So marking it as ALTERNATIVE with ALTERNATIVE_PRIORITY set to 100 Ref: https://git.yoctoproject.org/poky/commit/meta/recipes-bsp/pciutils?id=a81af375dfc51446b21548dce2afa6a77bc02df3 https://github.com/pciutils/pciutils/commit/0b307156c92f61c1a02d232f4c6ed17e888de9a9 https://git.yoctoproject.org/meta-virtualization/tree/recipes-core/busybox/busybox/lspci.cfg https://git.yoctoproject.org/meta-virtualization/tree/recipes-core/busybox/busybox_virtualization.inc#n4 https://git.yoctoproject.org/meta-virtualization/tree/recipes-core/busybox/busybox_%25.bbappend#n1 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/pciutils/pciutils_3.8.0.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb
index f3a67d97e4..4f57342e1e 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.8.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \
SRC_URI[sha256sum] = "91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05"
-inherit multilib_header pkgconfig
+inherit multilib_header pkgconfig update-alternatives
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}"
PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev"
@@ -59,3 +59,6 @@ FILES:libpci = "${libdir}/libpci.so.*"
SUMMARY:${PN}-ids = "PCI utilities - device ID database"
DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciutils."
RDEPENDS:${PN} += "${PN}-ids"
+
+ALTERNATIVE:${PN} = "lspci"
+ALTERNATIVE_PRIORITY = "100"