diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-01-17 16:58:46 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-18 13:28:07 +0000 |
| commit | 173a61826305838ba56a9da50491e657b4843f56 (patch) | |
| tree | 4173ecaf81630337e8ca1ab7ababf95bf02607be | |
| parent | fb7ea95fc367728f4fcfb0da4f5779e3d19df1bc (diff) | |
| download | poky-173a61826305838ba56a9da50491e657b4843f56.tar.gz | |
module.bbclass: do not use update-modules anymore
update-modules is obsolete. The bbclass was updated not to use it
anymore.
[YOCTO #3598]
(From OE-Core rev: 6fafbf71adb8b34211c2bc24226f0b1eb206a7d3)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/module.bbclass | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index ebb0880cd6..d477caa065 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | RDEPENDS_${PN} += "kernel-image ${@oe.utils.contains('DISTRO_FEATURES', 'update-modules', 'update-modules', '', d)}" | 1 | RDEPENDS_${PN} += "kernel-image" |
| 2 | DEPENDS += "virtual/kernel" | 2 | DEPENDS += "virtual/kernel" |
| 3 | 3 | ||
| 4 | inherit module-base | 4 | inherit module-base |
| @@ -27,13 +27,18 @@ module_do_install() { | |||
| 27 | 27 | ||
| 28 | pkg_postinst_append () { | 28 | pkg_postinst_append () { |
| 29 | if [ -z "$D" ]; then | 29 | if [ -z "$D" ]; then |
| 30 | depmod -a | 30 | depmod -a ${KERNEL_VERSION} |
| 31 | update-modules || true | 31 | else |
| 32 | depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} | ||
| 32 | fi | 33 | fi |
| 33 | } | 34 | } |
| 34 | 35 | ||
| 35 | pkg_postrm_append () { | 36 | pkg_postrm_append () { |
| 36 | update-modules || true | 37 | if [ -z "$D" ]; then |
| 38 | depmod -a ${KERNEL_VERSION} | ||
| 39 | else | ||
| 40 | depmod -a -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} | ||
| 41 | fi | ||
| 37 | } | 42 | } |
| 38 | 43 | ||
| 39 | EXPORT_FUNCTIONS do_compile do_install | 44 | EXPORT_FUNCTIONS do_compile do_install |
