Commit Graph

22 Commits

Author SHA1 Message Date
Dan McGregor
71677b7435 kmod: bump alternative priority
toybox by default has a priority of 60, and busybox of 50. Bump kmod's
priority so that it beats both toybox and busybox.

(From OE-Core rev: b17ae3e13dea4b12f1720170237142e04d5ab578)

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-10-18 23:26:35 +01:00
Alexander Kanavin
ff9f07b8a4 kmod: do not reset $bindir/sbindir, use EXTRA_OECONF instead
This was causing issues with classes that use $bindir to find
already installed binaries in rootfs (manpages class in particular).

$bindir needs to be the same for all recipes.

(From OE-Core rev: 3d92bce5a8e021c03e509e8ee6ead064e97bfcec)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-29 10:42:48 +01:00
George McCollister
d88ed5d3a0 kmod: use bash-completion.bbclass
Use bash-completion.bbclass to package bash completions.

(From OE-Core rev: 4f0716690ff4c7169b07e352df2301e77a3abc03)

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-30 11:37:02 +00:00
Joshua Lock
17f5a5a415 kmod: fix link creation when base_bindir != /bin
If base_bindir is not a direct child of / the link creation in
do_install_append creates incorrect relative links.

Instead pass a full path to the link source too the lnr script
to create a relative link.

(From OE-Core rev: dc184ace9d72a2d4f8eeec831942663cd3b1fd47)

Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-18 09:05:22 +01:00
Chen Qi
7ad628e0ef kmod: upgrade to 20
The following patches are rebased.
-- Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
-- avoid_parallel_tests.patch

The ptest part of kmod is removed because new version of kmod port all tests to
use modules from module-playground instead of copying prebuilt modules to the
repository. So, we cannot use ptest as before. Remove it so that kmod can build
successfully.

(From OE-Core rev: f80d136bdd578468035a88125fa1b84973fd912b)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-15 14:19:44 +01:00
Chong Lu
9adfa08360 kmod: fix debuginfo is missing in shared library
INHIBIT_PACKAGE_STRIP variable will make debuginfo lose in shared library.
The test cases of kmod contain kernel modules for many different architectures,
strip and arch gets confused and throws errors. Pack kernel modules in test
cases to avoid strip command failed.

(From OE-Core rev: 3576399ed163cb3136ee1a2077622035d2033158)

Signed-off-by: Chong Lu <Chong.Lu@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:11 +00:00
Otavio Salvador
4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.

(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:19 +01:00
Martin Jansa
7774bdf778 kmod: fix zlib dependency
* unlike BBCLASSEXTENDed native support, dependencies in kmod-native doesn't get
  automatic -native suffix, so kmod-native was depending on target zlib.
* move the dependency from .inc and apply it with right suffix

(From OE-Core rev: ef0a1812cd79a68f30da5b2770cd5c566d6ecf0b)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:56:28 +00:00
Saul Wold
cd414c0d1c kmod: Update to Rev 15 via git
Also nail down a previously floating dependancy on zlib, which is required for ptest

(From OE-Core rev: e76181535fce8bd4bb63f55106de4d074cae4e06)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-18 15:49:56 +01:00
Tudor Florea
17b5f2f162 kmod: ptest fixes
Make kmod-ptest able to compile with separated source and
 build dir. Since kmod test files contain kernel modules for
 many different architectures, strip and arch gets confused
 and throws errors.

(From OE-Core rev: 61cb45869caaed6578a217effaa72d247395d078)

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-07 09:37:31 +01:00
Khem Raj
695039598b kmod: Upgrade to version 14
The update is a requirement for systemd-206

(From OE-Core rev: faacfeb7cb7bed9ad5eb387d358309a2b1d40f06)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-28 00:37:00 +01:00
Tudor Florea
18f39e5456 kmod: Add ptest
Install kmod test suite and run it as ptest.

(From OE-Core rev: 152c973227e41b7736457b7f8c40849cc71b45ca)

Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-24 11:35:35 +01:00
Emilia Ciobanu
3c0300ba86 kmod:add GIT revision to PV variable
Git packages should have the following format for the PV variable:
	version_tag+git[r|\-|]?AUTOINC+git_revision

Git packages should include git token inside the PV variable.

(From OE-Core rev: 70d0938c304cd49e08cbcb28e391e7ace8e666e0)

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-24 11:35:31 +01:00
Radu Moisan
e172be54cf kmod: Upgrade to upstream version 9.0
(From OE-Core rev: 9fcbd447e99af5228cccb6a84dd6398c61574caf)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-02 15:28:38 +01:00
Richard Purdie
96a013573d kmod: Remove bashism from recipe
Without this, the installed files get mangled when a dash shell is used.

(From OE-Core rev: 59db7976fa870084af19d880e594b0e94678cf19)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-30 17:32:31 +01:00
Mark Hatle
9a686b3481 kmod: use new update-alternatives
(From OE-Core rev: 5879e0d3a2b3a6d000e33cadf4407c38ae1eb1ab)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-30 12:04:44 +01:00
Koen Kooi
b7c1ac8690 Revert "kmod: Use base_libdir for installing libkmod"
The commit breaks pkgconfig and after discussing it with the kmod and udev maintainers the conclusion was reached that putting the libraries in /lib instead of /usr/lib is not supported.

This reverts commit 6b74f2461735272bd950a4f060dab6e778a36f92.

(From OE-Core rev: 7163ebd92a799b8f000b2b6f303b20de468b5f90)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-17 21:13:11 +01:00
Martin Jansa
bc84461b32 kmod: fix upgrade path from module-init-tools
* PROVIDES does not need _${PN}
* CONFLICTS should be RCONFLICTS
* opkg needs RREPLACES to automatically remove older module-init-tools
  instead of just reporting it conflicts with kmod

SHR root@gjama ~ $ opkg install kmod
Installing kmod (7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0) to root...
Downloading http://jama.dyndns-home.com/org.openembedded.shr-core//armv4t/kmod_7+git02629fa02e96763db7460a930239cc93649a52f8-r0.0_armv4t.ipk.
Removing package module-init-tools-depmod from root...
update-alternatives: removing //sbin/depmod as no more alternatives exist for it
Removing package module-init-tools from root...
update-alternatives: Linking //sbin/insmod to ../bin/busybox
update-alternatives: Linking //sbin/modprobe to ../bin/busybox
update-alternatives: Linking //sbin/rmmod to ../bin/busybox
update-alternatives: removing //sbin/modinfo as no more alternatives exist for it
update-alternatives: removing //bin/lsmod as no more alternatives exist for it
update-alternatives: Linking //sbin/lsmod to ../bin/busybox
Configuring kmod.
update-alternatives: Linking //sbin/insmod to /sbin/insmod.kmod
update-alternatives: Linking //sbin/modprobe to /sbin/modprobe.kmod
update-alternatives: Linking //sbin/rmmod to /sbin/rmmod.kmod
update-alternatives: Linking //sbin/modinfo to /sbin/modinfo.kmod
update-alternatives: Linking //bin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/lsmod to /bin/lsmod.kmod
update-alternatives: Linking //sbin/depmod to /sbin/depmod.kmod

(From OE-Core rev: 8de7f8045f28aecfe796afcdb013c557ce9d1372)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-09 21:01:52 +01:00
Khem Raj
6b5dbc8e33 kmod: Use base_libdir for installing libkmod
This also helps avoid QA errors about binaries
accessing contents from /usr/lib

Also fixes emptry libkmod problem since now
the files are installed in expected place

(From OE-Core rev: 6b74f2461735272bd950a4f060dab6e778a36f92)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-09 21:01:52 +01:00
Martin Jansa
d36a73f7c4 kmod: include libkmod also from libdir
* until it's decided it should be installed in base_libdir or libdir
* fixes libkmod packaging

(From OE-Core rev: 87249372b4a9951f9e4dc6acece950718382a164)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-09 21:01:51 +01:00
Martin Jansa
bc2c2fe1f6 kmod: disable man pages generation because we don't have working xsltproc
(From OE-Core rev: 7d782a6ef77072d7f0fe50d8208c24c9e9ea9507)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-07 16:42:47 +01:00
Khem Raj
b4bc0a7f1b kmod: Add recipes
kmod is replacement for module-init-tools

(From OE-Core rev: 716606f5446534e48b45fcc017e8bbdfe7f15e26)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-07 16:42:47 +01:00