diff options
Diffstat (limited to 'meta/classes/package.bbclass')
| -rw-r--r-- | meta/classes/package.bbclass | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index d39c694de5..8f58ad03f1 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -289,6 +289,8 @@ python package_do_split_locales() { if mainpkg.find('-dev'): mainpkg = mainpkg.replace('-dev', '') + summary = bb.data.getVar('SUMMARY', d, True) or pn + description = bb.data.getVar('DESCRIPTION', d, True) or "" for l in locales: ln = legitimize_package_name(l) pkg = pn + '-locale-' + ln @@ -296,7 +298,8 @@ python package_do_split_locales() { bb.data.setVar('FILES_' + pkg, os.path.join(datadir, 'locale', l), d) bb.data.setVar('RDEPENDS_' + pkg, '%s virtual-locale-%s' % (mainpkg, ln), d) bb.data.setVar('RPROVIDES_' + pkg, '%s-locale %s-translation' % (pn, ln), d) - bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for %s' % (l, pn), d) + bb.data.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l), d) + bb.data.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l), d) bb.data.setVar('PACKAGES', ' '.join(packages), d) @@ -497,7 +500,8 @@ python emit_pkgdata() { pkgdest = bb.data.getVar('PKGDEST', d, 1) pkgdatadir = bb.data.getVar('PKGDESTWORK', d, True) - lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) + # Take shared lock since we're only reading, not writing + lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d), True) data_file = pkgdatadir + bb.data.expand("/${PN}" , d) f = open(data_file, 'w') @@ -514,6 +518,7 @@ python emit_pkgdata() { write_if_exists(sf, pkg, 'PV') write_if_exists(sf, pkg, 'PR') write_if_exists(sf, pkg, 'DESCRIPTION') + write_if_exists(sf, pkg, 'SUMMARY') write_if_exists(sf, pkg, 'RDEPENDS') write_if_exists(sf, pkg, 'RPROVIDES') write_if_exists(sf, pkg, 'RRECOMMENDS') @@ -558,7 +563,7 @@ if [ x"$D" = "x" ]; then fi } -RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps" +RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps" # Collect perfile run-time dependency metadata # Output: @@ -606,7 +611,7 @@ python package_do_filedeps() { # Determine dependencies for pkg in packages.split(): - if pkg.endswith('-dbg'): + if pkg.endswith('-dbg') or pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or pkg.startswith('kernel-module-') != -1: continue # Process provides @@ -649,6 +654,7 @@ python package_do_shlibs() { shlibs_dir = bb.data.getVar('SHLIBSDIR', d, True) shlibswork_dir = bb.data.getVar('SHLIBSWORKDIR', d, True) + # Take shared lock since we're only reading, not writing lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) def linux_so(root, path, file): @@ -878,6 +884,7 @@ python package_do_pkgconfig () { if hdr == 'Requires': pkgconfig_needed[pkg] += exp.replace(',', ' ').split() + # Take shared lock since we're only reading, not writing lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) for pkg in packages.split(): @@ -1038,6 +1045,8 @@ python package_depchains() { for suffix in pkgs: for pkg in pkgs[suffix]: + if bb.data.getVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', d): + continue (base, func) = pkgs[suffix][pkg] if suffix == "-dev": pkg_adddeprrecs(pkg, base, suffix, func, depends, d) @@ -1062,7 +1071,7 @@ PACKAGEFUNCS ?= "perform_packagecopy \ package_depchains \ emit_pkgdata" -python package_do_package () { +python do_package () { packages = (bb.data.getVar('PACKAGES', d, True) or "").split() if len(packages) < 1: bb.debug(1, "No packages to build, skipping do_package") @@ -1091,6 +1100,7 @@ do_package[sstate-plaindirs] = "${PKGD} ${PKGDEST}" do_package[sstate-inputdirs] = "${PKGDESTWORK} ${SHLIBSWORKDIR}" do_package[sstate-outputdirs] = "${PKGDATA_DIR} ${SHLIBSDIR}" do_package[sstate-lockfile] = "${PACKAGELOCK}" +do_package[stamp-extra-info] = "${MACHINE}" do_package_setscene[dirs] = "${STAGING_DIR}" python do_package_setscene () { @@ -1106,8 +1116,6 @@ do_package_write[noexec] = "1" do_build[recrdeptask] += "do_package_write" addtask package_write before do_build after do_package -EXPORT_FUNCTIONS do_package do_package_write - # # Helper functions for the package writing classes # |