summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-13 14:06:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-13 14:09:17 +0000
commit5fd3eb4bda651bddf4e4dc76d456333c70df4ddc (patch)
tree879d0e21782b64f93cb795f2b28e1e8c362702b4
parentfea3f526762a0d99fb08e2df201cd94b2a721916 (diff)
downloadpoky-5fd3eb4bda651bddf4e4dc76d456333c70df4ddc.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. (From OE-Core rev: ef24a545d11febb96d1c0f02c60d9701295ef592) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_ipk.bbclass4
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):
45 import subprocess 45 import subprocess
46 import textwrap 46 import textwrap
47 import collections 47 import collections
48 import glob
48 49
49 def cleanupcontrol(root): 50 def cleanupcontrol(root):
50 for p in ['CONTROL', 'DEBIAN']: 51 for p in ['CONTROL', 'DEBIAN']:
@@ -101,8 +102,7 @@ def ipk_write_pkg(pkg, d):
101 bb.utils.mkdirhier(pkgoutdir) 102 bb.utils.mkdirhier(pkgoutdir)
102 os.chdir(root) 103 os.chdir(root)
103 cleanupcontrol(root) 104 cleanupcontrol(root)
104 from glob import glob 105 g = glob.glob('*')
105 g = glob('*')
106 if not g and localdata.getVar('ALLOW_EMPTY', False) != "1": 106 if not g and localdata.getVar('ALLOW_EMPTY', False) != "1":
107 bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR'))) 107 bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR')))
108 return 108 return