diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-16 23:40:14 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-16 23:40:14 +0000 |
| commit | 442b1e01c075ef23f9db223f8199c0d351661029 (patch) | |
| tree | 35b8a6bda8e7bd91965ec32c00430b3ecdf7f9a2 /classes | |
| parent | 280ac5f9fd6d38d3c1e53f740e627b27e54eaee9 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/16 23:14:38+00:00 nexus.co.uk!pb
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe
2005/01/16 23:14:08+00:00 nexus.co.uk!pb
call read_subpackage_metadata at the start of package_ipk, not from base.bbclass anonymous function
BKrev: 41eafb5emDtcv2ti43OMi-pcTItdsA
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 1 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index c5b7ede8d0..501eefb50b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -656,7 +656,6 @@ python __anonymous () { bb.build.exec_func('read_manifest', d) bb.build.exec_func('parse_manifest', d) bb.build.exec_func('read_shlibdeps', d) - bb.build.exec_func('read_subpackage_metadata', d) except exceptions.KeyboardInterrupt: raise except Exception, e: diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 550dc41508..f4d816adad 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -63,6 +63,8 @@ python package_ipk_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") |