summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-01-29 14:38:11 -0800
committerSaul Wold <sgw@linux.intel.com>2013-01-29 16:17:25 -0800
commit8617f7eb150c8caf81f73f7047c0b10d3683af2b (patch)
tree56347e7894b10ca169b6026c17b4d08c19d83efd
parent87017b554ef83f4e3be0fcde153a823ce183c169 (diff)
downloadpoky-8617f7eb150c8caf81f73f7047c0b10d3683af2b.tar.gz
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] (From OE-Core rev: cf05c4578c99c0cb885cf2706f7f2b39b100aeb8) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/module.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
index d477caa065..c933d3226d 100644
--- a/meta/classes/module.bbclass
+++ b/meta/classes/module.bbclass
@@ -25,7 +25,7 @@ module_do_install() {
25 modules_install 25 modules_install
26} 26}
27 27
28pkg_postinst_append () { 28pkg_postinst_${PN}_append () {
29if [ -z "$D" ]; then 29if [ -z "$D" ]; then
30 depmod -a ${KERNEL_VERSION} 30 depmod -a ${KERNEL_VERSION}
31else 31else
@@ -33,7 +33,7 @@ else
33fi 33fi
34} 34}
35 35
36pkg_postrm_append () { 36pkg_postrm_${PN}_append () {
37if [ -z "$D" ]; then 37if [ -z "$D" ]; then
38 depmod -a ${KERNEL_VERSION} 38 depmod -a ${KERNEL_VERSION}
39else 39else