summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-04-23 21:48:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:09 (GMT)
commit5c507a2fd7514a943b950fb0b2134c3fa3c4419a (patch)
tree273f4096334e012e4cd286fa2c463008d176ad88 /meta/classes
parentbf4740cf66fe4579e7c55512dc2887e3f2decb83 (diff)
downloadpoky-5c507a2fd7514a943b950fb0b2134c3fa3c4419a.tar.gz
{kernel, module}.bbclass: don't run depmod for module packages during do_rootfs
* depmod already gets executed by pkg_postinst_kernel-image. * If you build a module using module.bbclass, pkg_postinst returns 1 in do_rootfs, causing pkg_postinst to run again on first boot. To improve this situation, I copied pkg_postinst from kernel.bbclass to module.bbclass. This was rejected by Koen, because he doesn't like the code from kernel.bblcass, which uses ${STAGING_DIR_KERNEL}. Richard then suggested that calling depmod during do_rootfs wasn't necessary at all, because it already gets done by kernel-image. (From OE-Core rev: 663b4be025283a30adb823760ce9d9a056106bcf) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel.bbclass4
-rw-r--r--meta/classes/module.bbclass7
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 3519e7c..c21ab96 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -276,9 +276,7 @@ fi
276} 276}
277 277
278pkg_postinst_modules () { 278pkg_postinst_modules () {
279if [ -n "$D" ]; then 279if [ -z "$D" ]; then
280 ${HOST_PREFIX}depmod -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION}
281else
282 depmod -a 280 depmod -a
283 update-modules || true 281 update-modules || true
284fi 282fi
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index 53c16b7..91628e4 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -37,15 +37,14 @@ module_do_install() {
37} 37}
38 38
39pkg_postinst_append () { 39pkg_postinst_append () {
40 if [ -n "$D" ]; then 40if [ -z "$D" ]; then
41 exit 1
42 fi
43 depmod -a 41 depmod -a
44 update-modules || true 42 update-modules || true
43fi
45} 44}
46 45
47pkg_postrm_append () { 46pkg_postrm_append () {
48 update-modules || true 47update-modules || true
49} 48}
50 49
51EXPORT_FUNCTIONS do_compile do_install 50EXPORT_FUNCTIONS do_compile do_install