mirror of
https://git.yoctoproject.org/poky
synced 2026-04-03 02:02:21 +02:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user