summaryrefslogtreecommitdiff
path: root/classes/package.bbclass
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-20 05:14:20 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-01-20 05:14:20 +0000
commit4cc600f1bed1c629bf77ebf1178258ca860bca9b (patch)
tree9e2d211ed4d75983249a859fdc5b980d2b4fbf1a /classes/package.bbclass
parent99f1f609af5e0d629fe5a4ac154e5ed1acb8ac92 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/20 00:02:54-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2005/01/20 00:01:05-05:00 handhelds.org!kergoth Fix a critical bug resulting from the recent changes in bitbake (facilitating make -j). The behavior is that of the root filesystem not having a ton of required shared libraries, like libc. Our packaging classes relied on the tasks being able to modify the global metadata, which is no longer allowed. Rework how we do packaging to account for this. BKrev: 41ef3e2c_WACPUP9Waae3Humbe58ng
Diffstat (limited to 'classes/package.bbclass')
-rw-r--r--classes/package.bbclass11
1 files changed, 5 insertions, 6 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index ca2d90c697..53ec3b8e28 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -560,13 +560,12 @@ python package_do_split_locales() {
bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
}
+PACKAGEFUNCS = "do_install package_do_split_locales \
+ populate_packages package_do_shlibs \
+ package_do_pkgconfig read_shlibdeps"
python package_do_package () {
- bb.build.exec_func('do_install', d)
- bb.build.exec_func('package_do_split_locales', d)
- bb.build.exec_func('populate_packages', d)
- bb.build.exec_func('package_do_shlibs', d)
- bb.build.exec_func('package_do_pkgconfig', d)
- bb.build.exec_func('read_shlibdeps', d)
+ for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split():
+ bb.build.exec_func(f, d)
}
do_package[dirs] = "${D}"