diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-13 14:06:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-13 14:08:54 +0000 |
commit | ef24a545d11febb96d1c0f02c60d9701295ef592 (patch) | |
tree | 30ae37e937948be1e65b72552904818800f2fc28 /meta/classes/package_ipk.bbclass | |
parent | 837cd3c0ee318ff22065b77c6cc72b4d50abbf27 (diff) | |
download | openembedded-core-contrib-ef24a545d11febb96d1c0f02c60d9701295ef592.tar.gz |
package_ipk: Minor import tweak + ensure packages regenerated
The recent opkg-utils change didn't update all the packages since its
marked as ABISAFE (and has to be due to update-alternatives).
Fix a minor import issue to avoid multiple imports of glob which
also causes packages to re-generate.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 4f23977032..25d1ab725a 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -45,6 +45,7 @@ def ipk_write_pkg(pkg, d): import subprocess import textwrap import collections + import glob def cleanupcontrol(root): for p in ['CONTROL', 'DEBIAN']: @@ -101,8 +102,7 @@ def ipk_write_pkg(pkg, d): bb.utils.mkdirhier(pkgoutdir) os.chdir(root) cleanupcontrol(root) - from glob import glob - g = glob('*') + g = glob.glob('*') if not g and localdata.getVar('ALLOW_EMPTY', False) != "1": bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR'))) return |