diff options
author | Richard Purdie <richard@openedhand.com> | 2007-09-01 23:49:12 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-09-01 23:49:12 +0000 |
commit | 63b739f0fe03873402731f0cf9992551540c16df (patch) | |
tree | fa3f2ef3988648402d2bdacaa72aab73f29a2f77 /meta/classes/package_ipk.bbclass | |
parent | 8d342dc0569fb4274b8ac9dfe40b1ce8543799f4 (diff) | |
download | poky-63b739f0fe03873402731f0cf9992551540c16df.tar.gz |
classes: Sync various tweaks from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2643 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 1175d1e751..9e654aac5e 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -152,7 +152,7 @@ python do_package_ipk () { | |||
152 | localdata = bb.data.createCopy(d) | 152 | localdata = bb.data.createCopy(d) |
153 | root = "%s/install/%s" % (workdir, pkg) | 153 | root = "%s/install/%s" % (workdir, pkg) |
154 | 154 | ||
155 | lf = lockfile(root + ".lock") | 155 | lf = lockfile(root + ".lock") |
156 | 156 | ||
157 | bb.data.setVar('ROOT', '', localdata) | 157 | bb.data.setVar('ROOT', '', localdata) |
158 | bb.data.setVar('ROOT_%s' % pkg, root, localdata) | 158 | bb.data.setVar('ROOT_%s' % pkg, root, localdata) |
@@ -179,11 +179,12 @@ python do_package_ipk () { | |||
179 | del g[g.index('./CONTROL')] | 179 | del g[g.index('./CONTROL')] |
180 | except ValueError: | 180 | except ValueError: |
181 | pass | 181 | pass |
182 | if not g and not bb.data.getVar('ALLOW_EMPTY', localdata): | 182 | if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": |
183 | from bb import note | 183 | from bb import note |
184 | note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) | 184 | note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) |
185 | unlockfile(lf) | 185 | unlockfile(lf) |
186 | continue | 186 | continue |
187 | |||
187 | controldir = os.path.join(root, 'CONTROL') | 188 | controldir = os.path.join(root, 'CONTROL') |
188 | bb.mkdirhier(controldir) | 189 | bb.mkdirhier(controldir) |
189 | try: | 190 | try: |
@@ -289,7 +290,6 @@ python do_package_ipk () { | |||
289 | os.rmdir(controldir) | 290 | os.rmdir(controldir) |
290 | except OSError: | 291 | except OSError: |
291 | pass | 292 | pass |
292 | del localdata | ||
293 | unlockfile(lf) | 293 | unlockfile(lf) |
294 | } | 294 | } |
295 | 295 | ||