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

diff --git a/classes/base.bbclass b/classes/base.bbclass
index c5b7ede..501eefb 100644 (file)
--- 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 550dc41..f4d816a 100644 (file)
--- 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")