zepto-forks/meta-mortsgna
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

base bbclass: catch up with yocto

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-02-01 13:32:36 +01:00
parent 81809c9168
commit e2ef6a5560
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
classes/base.bbclass
View File

@@ -259,7 +259,13 @@ python base_do_unpack() {
continue
local = os.path.realpath(local)
lf = bb.utils.lockfile(urldata[url].lockfile)
ret = oe_unpack_file(local, localdata, url)
if bb.fetch.__version__ == "1":
ret = oe_unpack_file(local, localdata, url)
else:
# use bb.fetch2 unpack API
ud = urldata[url]
rootdir = bb.data.getVar('WORKDIR', localdata, True)
ret = ud.method.unpack(ud, rootdir, localdata)
bb.utils.unlockfile(lf)
if not ret:
raise bb.build.FuncFailed("oe_unpack_file failed with return value %s" % ret)
@@ -425,7 +431,8 @@ python () {
commercial_license = bb.data.getVar('COMMERCIAL_LICENSE', d, 1)
import re
if commercial_license and re.search(pn, commercial_license):
pnr = pn.replace('+', "\+")
if commercial_license and re.search(pnr, commercial_license):
bb.debug(1, "Skipping %s because it's commercially licensed" % pn)
raise bb.parse.SkipPackage("because it requires commercial license to ship product")