[oe-commits] Saul Wold : module.bbclass: Don't add pkg_postinst/ pkg_prerm to all packages in recipe

git at git.openembedded.org git at git.openembedded.org
Wed Jan 30 14:00:53 UTC 2013


Module: openembedded-core.git
Branch: master-next
Commit: cf05c4578c99c0cb885cf2706f7f2b39b100aeb8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cf05c4578c99c0cb885cf2706f7f2b39b100aeb8

Author: Saul Wold <sgw at linux.intel.com>
Date:   Tue Jan 29 14:38:11 2013 -0800

module.bbclass: Don't add pkg_postinst/pkg_prerm to all packages in recipe

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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/module.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index d477caa..c933d32 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -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





More information about the Openembedded-commits mailing list