mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes: Sync various tweaks from OE

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2643 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-09-01 23:49:12 +00:00
parent 8d342dc056
commit 63b739f0fe
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/package_ipk.bbclass
View File

@@ -152,7 +152,7 @@ python do_package_ipk () {
localdata = bb.data.createCopy(d)
root = "%s/install/%s" % (workdir, pkg)
lf = lockfile(root + ".lock")
lf = lockfile(root + ".lock")
bb.data.setVar('ROOT', '', localdata)
bb.data.setVar('ROOT_%s' % pkg, root, localdata)
@@ -179,11 +179,12 @@ python do_package_ipk () {
del g[g.index('./CONTROL')]
except ValueError:
pass
if not g and not bb.data.getVar('ALLOW_EMPTY', localdata):
if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
from bb import note
note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
unlockfile(lf)
continue
controldir = os.path.join(root, 'CONTROL')
bb.mkdirhier(controldir)
try:
@@ -289,7 +290,6 @@ python do_package_ipk () {
os.rmdir(controldir)
except OSError:
pass
del localdata
unlockfile(lf)
}