diff options
| author | Naveen Saini <naveen.kumar.saini@intel.com> | 2022-05-25 10:43:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-07 11:53:26 +0100 |
| commit | c9b490e16211c3766ee9a66fa25aaf5398fe9646 (patch) | |
| tree | 2c5b1b406895eb97f82421de9369e1c13ae854f0 | |
| parent | 87d7e9d703653271895e99919e47f6b9896f10f4 (diff) | |
| download | poky-c9b490e16211c3766ee9a66fa25aaf5398fe9646.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
(From OE-Core rev: bbb7dcb461c09409b556571cf645bcadf12f397c)
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>
(cherry picked from commit 257e7620a79ea50c0c59746ff9a3817d43411e39)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-bsp/pciutils/pciutils_3.7.0.bb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb b/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb index 7d1740f665..311e57a98b 100644 --- a/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb +++ b/meta/recipes-bsp/pciutils/pciutils_3.7.0.bb | |||
| @@ -13,7 +13,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \ | |||
| 13 | 13 | ||
| 14 | SRC_URI[sha256sum] = "9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb" | 14 | SRC_URI[sha256sum] = "9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb" |
| 15 | 15 | ||
| 16 | inherit multilib_header pkgconfig | 16 | inherit multilib_header pkgconfig update-alternatives |
| 17 | 17 | ||
| 18 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" | 18 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}" |
| 19 | PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" | 19 | PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev" |
| @@ -57,3 +57,6 @@ FILES:libpci = "${libdir}/libpci.so.*" | |||
| 57 | SUMMARY:${PN}-ids = "PCI utilities - device ID database" | 57 | SUMMARY:${PN}-ids = "PCI utilities - device ID database" |
| 58 | DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciutils." | 58 | DESCRIPTION:${PN}-ids = "Package providing the PCI device ID database for pciutils." |
| 59 | RDEPENDS:${PN} += "${PN}-ids" | 59 | RDEPENDS:${PN} += "${PN}-ids" |
| 60 | |||
| 61 | ALTERNATIVE:${PN} = "lspci" | ||
| 62 | ALTERNATIVE_PRIORITY = "100" | ||
