]> code.ossystems Code Review - openembedded-core.git/commitdiff
module.bbclass: Don't add pkg_postinst/pkg_prerm to all packages in recipe
authorSaul Wold <sgw@linux.intel.com>
Tue, 29 Jan 2013 22:38:11 +0000 (14:38 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 29 Jan 2013 23:51:59 +0000 (23:51 +0000)
The code in module.bbclass was appending the pkg_postinst and
pkg_prerm to all packages that are part of a given recipe, meaning
that the -lic, -dev, -doc, ... packages all got the scriptlet
This change uses  only which macthes with the RDEPENDS and FILES
already used in module.bbclass.

The failure was that rootfs creation would fail due to the -lic package
being installed before the kernel and the script would fail.

[YOCTO #3803]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/module.bbclass

index d477caa06541f1b26511c74d644209321a4fb0ef..c933d3226dfab1862a2c61a8093cb173b1e31d1c 100644 (file)
@@ -25,7 +25,7 @@ module_do_install() {
                   modules_install
 }
 
-pkg_postinst_append () {
+pkg_postinst_${PN}_append () {
 if [ -z "$D" ]; then
        depmod -a ${KERNEL_VERSION}
 else
@@ -33,7 +33,7 @@ else
 fi
 }
 
-pkg_postrm_append () {
+pkg_postrm_${PN}_append () {
 if [ -z "$D" ]; then
        depmod -a ${KERNEL_VERSION}
 else