Commit Graph

16 Commits

Author SHA1 Message Date
Richard Purdie
f730a3a037 depmodwrapper-cross: Mark as machine specific
The kernel and its staging directory are machine specific so the wrapper
needs to be as well. Also take the opportunity to remove the default
dependencies of the recipe since its a script and doesn't need the cross
compiler. This gives the build a little more scheduing freedom.

(From OE-Core rev: 1cc2ac769baae19b54184df5f43a3e77c1743c29)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-02 16:35:46 +00:00
Mark Hatle
86d6ec51f0 module.bbclass: Create a new depmodwrapper to assist cross-installs
Previously the build path to STAGING_KERNEL_DIR was being embedded into the
package post install scripts.  We avoid this behavior by generating a special
depmodwrapper script.  This script contains that hard-coded path, ensuring
that re-use of the sstate-cache (and/or packages) will always run through the
wrapper generated by the current build with a checksum that includes
STAGING_KERNEL_DIR.

[ YOCTO #3962 ]

(From OE-Core rev: b18c61bae4d7161c087a004bba3c696006f7a2f6)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-01 14:44:40 +00:00
Eric Bénard
9ee6b718c1 kmod: fix git repo URL
(From OE-Core rev: 156e0fca979585f72323041f8d8aeafcbd43dfc3)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-20 15:31:47 +00:00
Matthew McClintock
1736b1d4cd kmod-native_git.bb: fix builds for hosts with older libc
kmod will fail to build with the following error because O_CLOEXEC is
not defined:

| libkmod/libkmod-module.c: In function 'kmod_module_get_initstate':
| libkmod/libkmod-module.c:1640: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-module.c:1640: error: (Each undeclared identifier is reported only once
| libkmod/libkmod-module.c:1640: error: for each function it appears in.)
| libkmod/libkmod-module.c: In function 'kmod_module_get_refcnt':
| libkmod/libkmod-module.c:1754: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-module.c: In function 'kmod_module_get_sections':
| libkmod/libkmod-module.c:1913: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-file.c: In function 'kmod_file_open':
| libkmod/libkmod-file.c:282: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-file.c:282: error: (Each undeclared identifier is reported only once
| libkmod/libkmod-file.c:282: error: for each function it appears in.)

Since we are only using kmod-native for depmod, and it's a non-threaded
user of this libary being built this should be safe to override O_CLOEXEC.

Keep in mind this is ONLY effecting the native builds and not what is
being shipped in the root file system.

(From OE-Core rev: edcb57fe308979cc5b92359d064e32bb70d4ad76)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-25 14:46:59 +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
308024306c kmod: Add missing DEPENDS on pkgconfig-native
Without this it can't reautoconf or run configure since it depends on pkg-config.

(From OE-Core rev: 7673cd498a50f59b0e2954341de0e8c6913d374f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:23 +01:00
Ross Burton
7f42473ce3 kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for
(From OE-Core rev: 964b0f39c3ef884eeb4d372924610c29fa2c18f2)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:19 +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
Khem Raj
7f5e732208 kmod: Update to .8+ release
(From OE-Core rev: 8dd0e28809dba8ce6d42c127041c591664c81c59)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-09 21:01:51 +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