diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-08-12 09:36:50 +0000 |
---|---|---|
committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-08-12 09:36:50 +0000 |
commit | 36f9208ab9b44b30edd8b9981f21a376091aaffc (patch) | |
tree | ec1df86e977413ff353485efc014cb765231babe /classes | |
parent | a9b3ea4690137507aa66418d9f60a39a895a2bf8 (diff) |
package_{deb,ipk}.bbclass: change ALLOW_EMPTY check
- before an unset ALLOW_EMPTY meant False, while any string value meant True,
now "1" means True and any other value or unset means False
- this allows to set ALLOW_EMPTY = "1" and explicitly unset it for a
subpackage with ALLOW_EMPTY_somepackage = "0"
Diffstat (limited to 'classes')
-rw-r--r-- | classes/package_deb.bbclass | 2 | ||||
-rw-r--r-- | classes/package_ipk.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 9a8db4f8f2..c322af1f15 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -130,7 +130,7 @@ python do_package_deb () { del g[g.index('./DEBIAN')] 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))) continue diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index b5cc6af3bb..9200055495 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -131,7 +131,7 @@ 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))) continue |