linux/poky.git/scripts/oe-pkgdata-util, branch 1.6_M2

classes/package: record PKGSIZE as total file size in pkgdata

2013-12-03T17:45:49+00:00

We were using "du -sk" to collect the total size of all files in each package for writing out to PKGSIZE in each pkgdata file; however this reports the total space used on disk not the total size of all files, which means it is dependent on the block size and filesystem being used for TMPDIR on the build host. Instead, take the total of the size reported by lstat() for each packaged file, which we are already collecting for FILES_INFO in any case. Note: this changes PKGSIZE to be reported in bytes instead of kilobytes since this is what lstat reports, but this is really what we should be storing anyway so that we have the precision if we need it. Fixes [YOCTO #5334] (From OE-Core rev: 29615b36fca696822a715ece2afbe0bf9a43ed61) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

classes/package: fix FILES_INFO serialisation in pkgdata

2013-12-03T17:45:49+00:00

The FILES_INFO entry in each pkgdata file stores the list of files for each package. Make the following improvements to how this is stored: * Store paths as they would be seen on the target rather than erroneously including the full path to PKGDEST (which is specific to the build host the package was built on) * For simplicity when loading the data, store complete paths for each entry instead of trying to break off the first part and use it as the dict key * Record sizes for each file (as needed by Toaster) * Serialise the value explicitly using json rather than just passing it through str(). Fixes [YOCTO #5443]. (From OE-Core rev: ca86603607a69a17cc5540d69de0e242b33382d3) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/oe-pkgdata-util: fix global name 'debug' is not defined

2013-10-29T15:24:07+00:00

This global variable is no longer present, so pass in the value specified via the command line. (From OE-Core rev: fa90f92e52330a9bf5836c0832412af0927b19a9) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/oe-pkgdata-util: add ability to find a recipe from a target package

2013-10-29T10:41:35+00:00

Add a "lookup-recipe" command to show which recipe produced a particular package. (From OE-Core rev: 4ab561ac3df105b4b6487271b6ccc29445518d52) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/oe-pkgdata-util: add ability to look up runtime package names

2013-10-29T10:41:34+00:00

Add a "lookup-pkg" command to oe-pkgdata-util that can be used to find the runtime name of a package (after e.g. Debian library package renaming). (From OE-Core rev: d923846d91ae307372f1e48483e86807feeeb09d) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/oe-pkgdata-util: add ability to search for a target path

2013-10-29T10:41:34+00:00

Add ability to search for a target path in produced packages, in order to find which package provides a specific file. (From OE-Core rev: 0824f2f5cf4e05f82b6986ce6fb22fa1392b7776) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/oe-pkgdata-util: check path arguments to ensure they exist

2013-10-29T10:41:34+00:00

Show an error if the specified paths don't exist. (From OE-Core rev: eff2690f7976664e6257c1c19c89feea9152eb9e) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/oe-pkgdata-util: improve help text and command line parsing

2013-10-29T10:41:33+00:00

* Use optparse to parse command line * Make help text actually helpful by describing what each command does * Drop comment at the top listing the commands which is now superfluous (From OE-Core rev: feb317513fff638ad7abdba8ab34b8413f0ab055) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/oe-pkgdata-util: remove remnants of former pkgdata structure

2013-10-29T10:41:33+00:00

OE-Core commit 1b8e4abd2d9c0901d38d89d0f944fe1ffd019379 removed the vendor-os argument from the command line, and the code using the package architectures, so clean these items up. (From OE-Core rev: 8b9ee57afbbcf633cba66e4b6e8ab7339ad6d391) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

bitbake.conf/package: Collapse PKGDATA_DIR into a single machine specific directory

2013-09-14T07:21:00+00:00

Currently we have a hierarchy of pkgdata directories and the code has to put together a search path and look through each in turn until it finds the data it needs. This has lead to a number of hardcoded paths and file globing which is unpredictable and undesirable. Worse, certain tricks that should be easy like a GL specific package architecture become problematic with the curretn search paths. With the modern sstate code, we can do better and construct a single pkgdata directory for each machine in just the same way as we do for the sysroot. This is already tried and well tested. With such a single directory, all the code that iterated through multiple pkgdata directories and simply be removed and give a significant simplification of the code. Even existing build directories adapt to the change well since the package contents doesn't change, just the location they're installed to and the stamp for them. The only complication is the we need a different shlibs directory for each multilib. These are only used by package.bbclass and the simple fix is to add MLPREFIX to the shlib directory name. This means the multilib packages will repackage and the sstate checksum will change but an existing build directory will adapt to the changes safely. It is close to release however I believe the benefits this patch give us are worth consideration for inclusion and give us more options for dealing with problems like the GL one. It also sets the ground work well for shlibs improvements in 1.6. (From OE-Core rev: 1b8e4abd2d9c0901d38d89d0f944fe1ffd019379) Signed-off-by: Richard Purdie