diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-20 05:14:20 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-20 05:14:20 +0000 |
| commit | 4cc600f1bed1c629bf77ebf1178258ca860bca9b (patch) | |
| tree | 9e2d211ed4d75983249a859fdc5b980d2b4fbf1a /classes/package_ipk.bbclass | |
| parent | 99f1f609af5e0d629fe5a4ac154e5ed1acb8ac92 (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_ipk.bbclass')
| -rw-r--r-- | classes/package_ipk.bbclass | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index f4d816adad..1119502bc8 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -2,6 +2,7 @@ inherit package DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}" BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link" BOOTSTRAP_EXTRA_DEPENDS += "ipkg-collateral ipkg ipkg-link" +PACKAGEFUNCS += "do_package_ipk" python package_ipk_fn () { from bb import data @@ -59,12 +60,10 @@ python package_ipk_install () { raise bb.build.FuncFailed } -python package_ipk_do_package_ipk () { +python do_package_ipk () { import copy # to back up env data import sys - bb.build.exec_func('read_subpackage_metadata', d) - workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") @@ -226,7 +225,3 @@ python package_ipk_do_package_ipk () { pass del localdata } - -EXPORT_FUNCTIONS do_package_ipk - -addtask package_ipk after do_package before do_build |