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

login
register
mail settings
Submitter Saul Wold
Date Jan. 29, 2013, 10:38 p.m.
Message ID <1359499091-1481-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/43663/
State Accepted
Commit cf05c4578c99c0cb885cf2706f7f2b39b100aeb8
Headers show

Comments

Saul Wold - Jan. 29, 2013, 10:38 p.m.
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>
---
 meta/classes/module.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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