diff options
Diffstat (limited to 'external/poky/meta/classes/package_ipk.bbclass')
| -rw-r--r-- | external/poky/meta/classes/package_ipk.bbclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/external/poky/meta/classes/package_ipk.bbclass b/external/poky/meta/classes/package_ipk.bbclass index 5eb910ca..c008559e 100644 --- a/external/poky/meta/classes/package_ipk.bbclass +++ b/external/poky/meta/classes/package_ipk.bbclass @@ -8,13 +8,13 @@ IPKGCONF_SDK = "${WORKDIR}/opkg-sdk.conf" PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks" # Program to be used to build opkg packages -OPKGBUILDCMD ??= "opkg-build -Z xz" +OPKGBUILDCMD ??= 'opkg-build -Z xz -a "${XZ_DEFAULTS}"' OPKG_ARGS += "--force_postinstall --prefer-arch-to-version" OPKG_ARGS += "${@['', '--no-install-recommends'][d.getVar("NO_RECOMMENDATIONS") == "1"]}" OPKG_ARGS += "${@['', '--add-exclude ' + ' --add-exclude '.join((d.getVar('PACKAGE_EXCLUDE') or "").split())][(d.getVar("PACKAGE_EXCLUDE") or "").strip() != ""]}" -OPKGLIBDIR = "${localstatedir}/lib" +OPKGLIBDIR ??= "${localstatedir}/lib" python do_package_ipk () { workdir = d.getVar('WORKDIR') @@ -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 @@ -154,7 +154,6 @@ def ipk_write_pkg(pkg, d): ctrlfile.write('%s\n' % textwrap.fill(description, width=74, initial_indent=' ', subsequent_indent=' ')) else: ctrlfile.write(c % tuple(pullData(fs, localdata))) - # more fields custom_fields_chunk = get_package_additional_metadata("ipk", localdata) if custom_fields_chunk is not None: @@ -238,6 +237,10 @@ def ipk_write_pkg(pkg, d): cleanupcontrol(root) bb.utils.unlockfile(lf) +# Have to list any variables referenced as X_<pkg> that aren't in pkgdata here +IPKEXTRAVARS = "PRIORITY MAINTAINER PACKAGE_ARCH HOMEPAGE" +ipk_write_pkg[vardeps] += "${@gen_packagevar(d, 'IPKEXTRAVARS')}" + # Otherwise allarch packages may change depending on override configuration ipk_write_pkg[vardepsexclude] = "OVERRIDES" |