Commit Graph

46 Commits

Author SHA1 Message Date
Naveen Saini
c9b490e162 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
0b307156c9
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>
2022-06-07 11:53:26 +01:00
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Alexander Kanavin
8fe66342ba pciutils: upgrade 3.6.4 -> 3.7.0
(From OE-Core rev: 16a9c4bc965a0d62dd542337e576e7edad717231)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-09 13:13:59 +01:00
Wang Mingyu
575e4b2227 pciutils: upgrade 3.6.2 -> 3.6.4
refresh the following patch:
configure.patch

(From OE-Core rev: 498e0f83040fe2e83805d8b13d69c17c74a520ba)

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-02-13 12:19:14 +00:00
Robert Yang
632836de27 pciutils: 3.6.1 -> 3.6.2
(From OE-Core rev: 3347b7e5641646348e06a6f4c603d83c6be867c9)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-23 18:02:23 +01:00
Ross Burton
ad79b00257 pciutils: upgrade 3.5.6 -> 3.6.1
(From OE-Core rev: 2ed00ce1acb19f351149c02f25267b111991e8f7)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-07-24 11:52:26 +01:00
Andre McCurdy
f8fa4aab98 pciutils: move ASNEEDED over-ride into the pciutils recipe
Move the recipe specific over-ride for ASNEEDED into the recipe to
make it more apparent that the over-ride is being applied (and that
it should be re-checked on version updates, etc).

(From OE-Core rev: b7b63b2681a1de0ecb0e09612913370cb9934d38)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-05-15 10:56:50 +01:00
Ross Burton
0b94280064 pciutils: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: 7d56245a4859727f85dc5ae6f881d0783dee1ce1)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-11 06:27:00 -07:00
Chen Qi
0e0a94c200 pciutils: upgrade to 3.5.6
(From OE-Core rev: 7e40e007ccd7c97f9d6609d1c729a14b07b2638d)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-12-10 22:45:19 +00:00
Alexander Kanavin
483e54d5b7 pciutils: inherit pkgconfig so that libkmod can be found
(From OE-Core rev: e8c061a4c013d49a7f67b485d1634e9db0fbfe32)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-30 11:14:26 +01:00
Chen Qi
e1e723db1d pciutils: upgrade to 3.5.5
(From OE-Core rev: d1e05e9cbddea40ff582fae4ec7e2e7a4f52fd8f)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-27 22:36:53 +01:00
Richard Purdie
5e9b0569e2 pciutils: Fold patches into a single patch with a description
Patches patching content from other patches is bad. This folds the three
patches into one, improves some of what its doing to be a little
cleaner and adds a proper description to the patch header.

This also moves the STRIP override to the configure commandline rather
than patching and handles passing libdir the same way.

(From OE-Core rev: 186b30798cf74b738483e8708157cac628c1d3cd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-06-22 09:16:01 +01:00
Richard Purdie
4c2d0b1205 meta: Remove further uclibc remnants (inc. patches and site files)
Some of these are clearly dead, e.g. one binutils patch reverts the effects
of the earlier one.

This also removes the uclibc site files. We now have mechanisms to allow these
to be extended from another layer should someone ever wish to do that.

(From OE-Core rev: e01e7c543a559c8926d72159b5cd55db0c661434)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-06-22 09:16:00 +01:00
Fan Xin
0558ba93f0 pciutils: Upgrade to 3.5.4
(From OE-Core rev: cf0679d7404a4b019282b947488fb078402e5931)

Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-06-09 17:12:14 +01:00
Huang Qiyu
2774636c9e pciutils: 3.5.1 -> 3.5.2
Upgrade pciutils from 3.5.1 to 3.5.2.

(From OE-Core rev: 51383a279a5d67eb63d603f58c2c417327ff7a49)

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-08 10:31:29 +00:00
Robert Yang
b673a562d1 pciutils: fix PACKAGECONFIG
The PACKAGECONFIG's value doens't go into EXTRA_OECONF, but
PACKAGECONFIG_CONFARGS.

Fixed:
pciutils-3.5.1: libpci rdepends on libudev, but it isn't a build dependency, missing eudev in DEPENDS or PACKAGECONFIG? [build-deps]
pciutils-3.5.1: pciutils rdepends on libudev, but it isn't a build dependency, missing eudev in DEPENDS or PACKAGECONFIG? [build-deps]

(From OE-Core rev: d941d66d714545eae589115db48f1243399711f2)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-09-08 00:32:43 +01:00
Chen Qi
ff1105f2dc pciutils: upgrade to 3.5.1
(From OE-Core rev: c1ac61317d6cab49fe67c394dbffdacb977e2cd2)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-15 08:35:00 +01:00
Mike Crowe
974a8c072e pciutils: Explicitly set EXTRA_OEMAKE as required
The openssl recipe currently relies on EXTRA_OEMAKE having been set to
"-e MAKEFLAGS=" in bitbake.conf to operate. It is necessary to make this
explicit so that the default in bitbake.conf can be changed.

(From OE-Core rev: 92850650d32fcf609e7fa7a291774fc2bbe5ef5b)

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-04 13:09:56 +00:00
Chen Qi
6729889199 pciutils: upgrade to 3.4.1
(From OE-Core rev: ea32ea00de0907f1aaea1625438a89f2bf7a66d4)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-15 11:54:49 +00:00
Chen Qi
b92fd39801 pciutils: upgrade to 3.3.1
(From OE-Core rev: f3da54f88669630efcbde62da097cb7487e65101)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-27 14:59:51 +01:00
Robert Yang
05a1f2b682 pciutils: remove libpci-dev and libpci-dbg from PACKAGES
There should be only one dev and dbg package

(From OE-Core rev: 91f91ff86f3259caaad290fa4efc288e502d4970)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-13 22:33:21 +01:00
Chen Qi
e400e0372b pciutils: change default value of PACKAGECONFIG
Default PACKAGECONFIG value to "hwdb" if 'systemd' is in DISTRO_FEATURES.

(From OE-Core rev: 9a7d1149c5f97c8f7b8fef12b4f77ae7c6d88b2c)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-31 08:14:20 +00:00
Chen Qi
8bc9af4282 pciutils: add PACKAGECONFIG for 'hwdb'
Add PACKAGECONFIG for 'hwdb' to fix the following QA warning.
WARNING: QA Issue: libpci rdepends on libudev, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: pciutils rdepends on libudev, but it isn't a build dependency? [build-deps]

(From OE-Core rev: 9188a2672013cb6960590f03f753178999fe4c3c)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-27 22:53:38 +00:00
Chen Qi
39e21d1fe5 pciutils: upgrade to 3.3.0
lib-build-fix.patch is removed as it doesn't seem useful.
do_compile_prepend is removed because it's not useful for the new version.
The following line is removed as I don't see any problem without it.
PARALLEL_MAKE = ""

(From OE-Core rev: 0df811d5afdb947bfef98f7c53268259c99b88be)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-27 22:53:38 +00:00
Ming Liu
69dd116eb9 pciutils: Fix multilib header conflict - pci/config.h
pci/config.h conflicts between 32-bit and 64-bit versions.

(From OE-Core rev: 21fb6bc1b030cab14e2c9b14607b34a62262ac06)

Signed-off-by: Ming Liu <ming.liu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-11-04 10:27:12 +00:00
Paul Eggleton
8ae3f2293f pciutils: tidy up recipe
* Move package-specific defitions to the end
* Define pciutils-ids package as ${PN}-ids
* Add SUMMARY and tweak DESCRIPTION for pciutils-ids package

(From OE-Core rev: c8c39c78878cdffe47b376b6211dd1ae45fd59d2)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:25 +00:00
Valentin Popa
27fb21db02 pciutils: upgrade to 3.2.1
(From OE-Core rev: f0edfb3a78657c43fb74ebb1c481af3e9d11fc3f)

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-24 12:25:34 +00:00
Richard Purdie
5e42796675 recipes: Remove PR = r0 from all recipes
Remove all PR = "r0" from all .bb files in oe-core. This was done
with the command sed -e '/^PR.*=.*r0\"/d' recipes*/*/*.bb -i

We've switching to the PR server, PR bumps are no longer needed and
this saves people either accidentally bumping them or forgetting to
remove the lines (r0 is the default anyway).

(From OE-Core rev: 58ae94f1b06d0e6234413dbf9869bde85f154c85)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-30 14:52:04 +00:00
Roy Li
8ce33c4bcc pciutils: remove pcimodules
pcimodules can not work due to no modules.pcimap file, and has been
replaced by "lspci -k", so we can remove it.

Update lib-build-fix.patch since remove pcimodules-pciutils.diff.

[YOCTO# 5210]

(From OE-Core rev: 57bec61b05c0fea42f988dd52942c7d5ce8833fd)

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-22 12:19:33 +01:00
Saul Wold
88ff9e0142 pciutils: Add kmod dependency
pciutils now uses libkmod to look up kernel module info.

[YOCTO #4821]

(From OE-Core rev: f6643c08c11fa8ff72172b76eb6dde2853971351)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:37 +01:00
Ionut Radu
092cc9483a pciutils: updated from 3.1.10 to 3.2.
(From OE-Core rev: 5d8dd6ec550764b89754812f0d06cc2baa707a1e)

Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-12 09:37:30 +01:00
Constantin Musca
79512d5ef9 pciutils: upgrade to 3.1.10
(From OE-Core rev: 8007bbf0bd8ef379340c75370fcdb29e367e5682)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-17 18:04:22 +01:00
Nitin A Kamble
ba53417256 pciutils: fix a do_compile failure
Avoid this issue:

| ln -s libpci.so.3.1.9 libpci.so
| ln: failed to create symbolic link `libpci.so': File exists
| make[1]: *** [libpci.so] Error 1
| make[1]: Leaving directory `/srv/home/nitin/builds/build-multilib/tmp/work/x86_64-poky-linux/pciutils-3.1.9-r0/pciutils-3.1.9/lib'
| make: *** [lib/libpci.so] Error 2
| ERROR: oe_runmake failed
NOTE: package pciutils-3.1.9-r0: task do_compile: Failed

PR not bumped as there are no changes in the output packages.

(From OE-Core rev: b1ce043d46f7465daf320d80ddd0db0b69def917)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19 14:37:39 +00:00
Joshua Lock
f408dd164e pciutils: fix configure script for dash
configure.patch was missing a closing quote in a sed expression which
causes script execution to error on less forgiving shells such as dash.

(From OE-Core rev: ad72484a2783afa948966263629006558fbde476)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-02 18:28:26 +00:00
Shane Wang
27aec8bef6 pciutils: upgrade to 3.1.9
(From OE-Core rev: 745bdcd3421747b050493079101f6f5ba7830daf)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-24 11:54:25 +00:00
Dongxiao Xu
9fa68e8aea pciutils: Change the hardcoded /usr/lib to support multilib.
(From OE-Core rev: 99e1b18de5de1fb8558222cef2fc9aac27a797a6)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:32 +01:00
Qing He
9deb373671 update patch upstream status
This patch includes the update of patch upstream status of the following
recipes (50 in all):

grub pciutils setserial dhcp iproute2 libnss-mdns nfs-utils openssl portmap
busybox coreutils dbus dropbear ncurses readline sysfsutils sysvinit tinylogin
udev update-rc.d util-linux elfutils file pkgconfig syslinux ubootchart
yaffs2 findutils gamin hdparm libaio libzypp parted procps sat-solver
screen sed sysklogd tcp-wrapper time zypper attr boost createrepo gnutls
hal js libgcrypt libnl libusb-compat

(From OE-Core rev: 1e6f767663b7d5fb6277fd2b214f4a50e24d4ffd)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 11:02:14 +01:00
Khem Raj
3909b764b7 recipes: Use -uclibceabi instead of -uclibcgnueabi
(From OE-Core rev: 3aa429406184d27bdb8a771c4c12bde1dcccb95b)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 14:09:33 +01:00
Tom Rini
d56080ff06 Various: Update KERNELORG_MIRROR for consistency
In mirrors.bbclass we point into /pub but we don't in bitbake.conf.
All uses of KERNELORG_MIRROR look into /pub anyhow, so lets make
use of that.

(From OE-Core rev: 67a0c8f48b5ef2ae5fc712c9204e4e99818c8134)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:44:04 +00:00
Tom Rini
4f85b60306 Various: Switch to KERNELORG_MIRROR
(From OE-Core rev: a0eeed089a5c185ef721b11828d4a27f0c03791c)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:44:03 +00:00
Richard Purdie
a3158fa684 pciutils: Don't install the uncompressed version of pci.ids, the compressed version will suffice
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-05 13:34:49 +00:00
Saul Wold
3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Qing He
b24ca397c4 pciutils: upgrade to version 3.1.7
from 3.1.5

Signed-off-by: Qing He <qing.he@intel.com>
2010-11-14 16:50:19 -08:00
Mark Hatle
daa21c1e0a recipes-bsp: Cleanup package descriptions and summaries
[BUGID #281]

Evaluate and update each package in recipes-bsp to ensure they have a
consistent summary and description.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-10-11 22:15:37 +01:00
Richard Purdie
29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00