summaryrefslogtreecommitdiffstats
path: root/bitbake/bin/bitbake-layers
Commit message (Collapse)AuthorAgeFilesLines
* bitbake: bitbake-layers: show-recipes: allow filtering by class inheritancePaul Eggleton2015-08-191-5/+43
| | | | | | | | | | | | Add a -i/--inherits option to filter the output to include only recipes inheriting the specified class(es). Implements [YOCTO #7475]. (Bitbake rev: e4ec622d9dc5f882049f5e8027331ec1e17681de) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix mapping files to layersPaul Eggleton2015-08-191-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitbake-layers needs to map recipe and class files to the layer they came from within the show-recipes and show-overlayed commands. However, it turns out that mapping a file to the layer it came from is not as trivial as it might seem. To do it properly we need to match the path to an entry in BBFILES then map that to the collection name using BBFILE_PATTERN, then map that to the actual layer using variable history. If it doesn't match any entry in BBFILES, then we can fall back to BBFILE_PATTERN (to handle classes and conf files). This fixes the layer name not showing up properly in the output of the show-recipes and show-overlayed commands for recipes in layers such as meta-intel that have subdirectories in BBFILE_PATTERN. It also fixes the priority not showing up in show-layers for such layers. As part of this I've added a function to VariableHistory which for a space-separated list variable gives you a dict mapping the items added to the files in which they were added. I've also fixed bb.utils.get_file_layer() and reduced some of the duplication by using this function in bitbake-layers. Also fixes the priority not showing up for layers such as meta-intel Fixes [YOCTO #8160]. (Bitbake rev: e852f6cabd7489585477ab567a1afeb2252377ac) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: remove-layer: accept just layer directoryPaul Eggleton2015-08-191-0/+2
| | | | | | | | | | | If the specified layer isn't a path, then just match on the directory. Fixes [YOCTO #7839]. (Bitbake rev: b4c45bf6c42b4d319ba868f4ce77e86c8b585818) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: ensure we exit if BBLAYERS_LAYERINDEX_URL is not setPaul Eggleton2015-08-191-0/+1
| | | | | | | | | We were printing an error here, but not exiting. (Bitbake rev: ddcaf8950a0b1cc74806e1ad7b49a1de0ea0d2b1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: use "with open" consistentlyPaul Eggleton2015-08-191-33/+29
| | | | | | | | | | It's best practice to use "with open..." rather than open & close where practical. (Bitbake rev: 1ef38549cae5639f2c8bcc2b270c5c82a5e29e3c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: refactor show-appends to stop using cooker ↵Paul Eggleton2015-08-191-8/+13
| | | | | | | | | bbappends list (Bitbake rev: 60a253555a3ebadea775cfdc3331cba78ee3e71b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: Convert flatten to use collections.bbappendsRichard Purdie2015-08-191-24/+20
| | | | | | | | | | | | flatten support currently looks broken since it doesn't appear to deal with handling "%" support in bbappend file names. This patch converts it to use collections.get_file_appends() which correctly handles "%" support. (Bitbake rev: 0448714c52bc1e9584a5282cffdcaa404fb0618a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: ensure non-extended recipe name is preferredRichard Purdie2015-04-131-1/+7
| | | | | | | | | | | | | | | In show-recipes and show-overlayed, we only list one variant of each recipe where multiple exist, therefore we should show the main one (e.g. in OpenEmbedded, we now show openssl and not nativesdk-openssl which would otherwise sort first.) Fixes [YOCTO #7514]. (Bitbake rev: c4172fe33f0c63eda7f4af2bd36a5e9738e13595) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: use stdout instead of stderr for loggingPaul Eggleton2015-03-161-1/+1
| | | | | | | | | | | | | We use logger.plain() to produce actual output which needs to go to stdout. We could use more advanced filtering (and probably should in future) but for the moment let's just fix the regression. Fixes [YOCTO #7458]. (Bitbake rev: e96fc0ccfc9f5be2c41c9733c92dc81df3df5065) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix wildcard support in remove-layerPaul Eggleton2015-02-251-1/+1
| | | | | | | | | | | | The recent refactoring caused use of wildcards to trigger a traceback because the old variable name was being used. Fixes [YOCTO #7367]. (Bitbake rev: 7182cdd3c4a534a87147bb0aad7b360ffef6426b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: add ability to fetch layers and their dependencies ↵Chong Lu2015-02-211-0/+252
| | | | | | | | | | | | | | | | from layer index Add a command to query layer dependencies from a layer index such as the OpenEmbedded Layer Index at http://layers.openembedded.org. Fetches the layer and its dependencies and adds them into conf/bblayers.conf. [YOCTO #5348] (Bitbake rev: 4b8fcf9a5bc802793bf332334217faace55f14f6) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix loggingPaul Eggleton2015-02-211-2/+12
| | | | | | | | | Logging output was simply not getting printed. (Bitbake rev: 62b825b19b13a914cbff5303d541bd5dbbec90a7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: refactor to use argparse instead of cmdPaul Eggleton2015-02-211-151/+110
| | | | | | | | | | | | | | | | This makes help formatting and option handling a lot more standardised and allows us to drop a bunch of code. We also gain slightly more straightforward error handling. One side-effect however is that the old subcommand syntax using underscores is no longer supported. The dashed form has been supported (and displayed in the help text) for quite a while now so I wouldn't imagine that will be much of an issue. (Bitbake rev: 6e2f09b58882d3949026b9dd545f789ad3fe6fab) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix error handling in add-layer / remove-layerPaul Eggleton2014-12-301-1/+1
| | | | | | | | | | * Fix add-layer error message when a layer is already in BBLAYERS * Ensure we show an error message if we can't find BBLAYERS at all (Bitbake rev: 1c743fd2103730e27699dd55efc6914d3b0c3702) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: add commands for adding and removing layersPaul Eggleton2014-12-231-0/+54
| | | | | | | | | | Add add-layer and remove-layer commands for easily adding and removing layers to/from bblayers.conf. (Bitbake rev: 0e94aed033917b91ea6ba0522b14a040c3bdc987) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake: show wildcard appends for bitbake-layersAsh Charles2014-06-061-1/+1
| | | | | | | | | | | The 'bitbake-layers show-appends' command can use the built-in get_file_appends() method which correctly identifies bbappends that include a '%' wildcard in their filename. (Bitbake rev: 2732dbae67c1945b668c38cc4cc5678c4aafe3d6) Signed-off-by: Ash Charles <ashcharles@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: show-cross-depends: add support for RRECOMMENDSPaul Eggleton2014-05-281-0/+20
| | | | | | | | | | RRECOMMENDS must be satisfied at build time, and these could cross layer boundaries, so report these if they exist. (Bitbake rev: 5569b3dca61e6d962494ca65c7aad09b2eb2ae63) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: show-cross-depends: ignore self-satisfied RDEPENDSPaul Eggleton2014-05-281-0/+3
| | | | | | | | | | | Overlayed recipes caused this to show false positives because the overlaying version appeared to be satisfying the overlayed version's RDEPENDS; but you'd never be building both at the same time. (Bitbake rev: b94318174fe7f92b9a20eabb0bc4055066cb3d51) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: show-cross-depends: ignore global inheritsPaul Eggleton2014-05-281-0/+5
| | | | | | | | | | It's not particularly useful to show globally inherited classes here since they do not normally represent a dependency. (Bitbake rev: d16948bb88fcf44d861985838030be7c08697963) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: show-cross-depends: add option to ignore a layerPaul Eggleton2014-05-281-20/+24
| | | | | | | | | | | | | | | | By default, show-cross-depends shows dependencies on OE-Core (i.e. "meta") which is not particularly useful. Add an option to allow you to hide those. For example, to hide all dependencies on OE-Core: bitbake-layers show-cross-depends -i meta Multiple layers can be specified by using commas as separators (no spaces). (Bitbake rev: 0e9062e65acbb05c1d9b3a9145eb866c3d562309) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: avoid loading configuration when not neededPaul Eggleton2013-11-241-9/+15
| | | | | | | | | | | | | | In recent versions of bitbake, it is not possible to initialise a BBCooker object without having it load the configuration first. Thus we should avoid creating the Tinfoil object here in bitbake-layers which does that internally until we actually need to, so you can run "bitbake-layers help" and not have to wait several seconds for the output. (Bitbake rev: 8f1e280fbbb6432d7bcc1fb4241f402668c6c5ea) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix for move of data object to cookerPaul Eggleton2013-06-101-4/+4
| | | | | | | (Bitbake rev: 063ee01935767ac4c9518d7477c8c85da1c9969a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix show-appends and flatten for recent cooker changesPaul Eggleton2013-05-241-8/+8
| | | | | | | | | | | | | Fixes the show-appends and flatten subcommands for recent refactoring in cooker. [YOCTO #4536] [YOCTO #4535] (Bitbake rev: 54817d0de667941ee68fe3490684159e2d90e9c5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix for move of calc_bbfile_priority within cookerPaul Eggleton2013-05-221-1/+1
| | | | | | | | | | | | calc_bbfile_priority is now in CookerCollectFiles which can be accessed on the collection attribute of a cooker instance. Fixes [YOCTO #4513]. (Bitbake rev: 5d941631ad7198737d9a5c5a920a9062fa0431f8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: cooker/bitbake-layers/tinfoil: Fix recipecache typoRichard Purdie2013-05-131-7/+7
| | | | | | (Bitbake rev: 0f5eee689992f84d263cb817dc2ce755a9a075f7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers/tinfoil: Catch up with status -> recpiecache renameRichard Purdie2013-05-121-7/+7
| | | | | | (Bitbake rev: 0a9cbe7a6a17c5df38cd442ee8650097d6bbf502) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix duplicated help infoRobert Yang2013-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | There are two "help" lines when run bitbake help under python 2.6.6 (perhaps all python 2.6): $ bitbake-layers help [snip] help display general help or help on a specified command [snip] help display general help or help on a specified command This is because the cmd.py in python 2.6.6 also has a do_help() function as our bitbake-layers, and the cmd.Cmd.get_names() doesn't consider the overload, this has been fixed in python 2.7, use set() to remove the duplicated would fix the problem. [YOCTO #3428] (Bitbake rev: 324ed96e28ec31cff8cef1824d20d40f9a5d46ad) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: make show-cross-depends avoid long pathRobert Yang2013-02-151-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | The "bitbake-layers show-cross-depends" print the absolute path in the past, now it will print the relative path (relative to the layer dir) by default, and add the "-f" option to make it print the absolute path. For example: $ bitbake-layers show-cross-depends [snip] meta-intel/meta-jasperforest/conf/machine/jasperforest.conf requires meta/conf/machine/include/ia32-base.inc [snip] $ bitbake-layers show-cross-depends -f [snip] /path/to/poky/meta-intel/meta-jasperforest/conf/machine/jasperforest.conf requires /path/to/poky/meta/conf/machine/include/ia32-base.inc [snip] [YOCTO #3824] (Bitbake rev: df217701318d60559be0b10214b883b8ce4f5d2a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: print the recipe's depends that crosses a layer ↵Robert Yang2013-01-311-0/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boundary Figure out the dependency between recipes that crosses a layer boundary * Introduction: - For the .bb file, we need check the following depends: > Check the DEPENDS, RDEPENDS and inherits according to the cooker_data. > The cooker_data doesn't have the info about "require/include xxx", so we need check them manually. - For the .bbclass, .inc and .conf file, we can't get their file depends from the cooker_data, we need check them manually. * Usage: $ bitbake-layer show-cross-depends I don't like the name "show-cross-depends", figure-out-cross-depends might be better, but most of the commands are "show-xxx" for bitbake-layers. * Output: (snipped) /work/poky/meta/recipes-support/libusb/libusb-compat_0.1.4.bb inherits /work/poky/meta-yocto/classes/poky-sanity.bbclass /work/poky/meta-intel/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb requires /work/poky/meta/recipes-sato/images/core-image-sato.bb /work/poky/meta-yocto/recipes-core/tiny-init/tiny-init.bb RDEPENDS /work/poky/meta/recipes-core/busybox/busybox_1.20.2.bb /work/poky/meta-intel/common/recipes-bsp/amt/lms_7.1.20.bb DEPENDS /work/poky/meta/recipes-devtools/autoconf/autoconf_2.69.bb /work/poky/meta/classes/distrodata.bbclass includes /work/poky/meta-yocto/conf/distro/include/package_regex.inc /work/poky/meta-intel/meta-sys940x/conf/machine/sys940x.conf requires /work/poky/meta/conf/machine/include/tune-atom.inc [YOCTO #3387] (Bitbake rev: 100502ef722bf19b6c125a5e017f31686ad18421) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix get_file_layerRobert Yang2013-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The get_file_layer can't handle the nested layer correctly, e.g.: meta-intel/conf/layer.conf meta-intel/meta-cedartrail/conf/layer.conf They are two layers, the file: meta-intel/common/recipes-bsp/amt/lms_7.1.20.bb belongs to meta-intel's layer, but the get_file_layer() may return meta-cedartrail accordig to BBLAYERS' order, since it uses: for layerdir in self.bblayers: if regex.match(os.path.join(layerdir, 'test')): return self.get_layer_name(layerdir) which doesn't care the filename, re-match the filename would fix the problem. [YOCTO #3387] (Bitbake rev: 7a31b9eac4d894c302f0e052a132c31b17d13d1f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: tinfoil: create simple interface for bitbake-based utilitiesPaul Eggleton2012-09-071-99/+47
| | | | | | | | | | | | The code to initialise BitBake within bitbake-layers should be useful for other utilities that need to query configuration or recipe information, so refactor it out into its own class, "Tinfoil" (to continue with our cooking metaphor). (Bitbake rev: e5707e3938ace47c4a8d1fa2e81583fd4dc6b95d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: use parsable title for show-appendsPaul Eggleton2012-08-221-1/+1
| | | | | | | | | | | Print title text surrounded by === as we do with other subcommands so that you can filter it out in scripts. (You will also want to filter out lines starting with "WARNING:" if you just want the list). (Bitbake rev: ba15ba16a5d863886bcfd5b3f0bdfff2a6de11a0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: avoid full parse for show-layers subcommandPaul Eggleton2012-08-221-4/+7
| | | | | | | | | | We don't actually need to parse all recipes just to show the configured layers, so just parse the configuration instead. (Bitbake rev: 406477cbae066b6379873e266cb79801e545a61c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: bitbake-layers: fix help for show-overlayed to match behaviourPaul Eggleton2012-08-021-1/+1
| | | | | | | | | | show-overlayed actually lists the same recipe in multiple layers regardless of priority, so change the help description to match. (Bitbake rev: 17217ff707e41780cb473b9cdd2621dd18b982c2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: hide deprecation warningsPaul Eggleton2012-04-171-0/+2
| | | | | | | | | | | | There are a number of DeprecationWarnings within BitBake code which bitbake itself filters out; bitbake-layers was not doing this, resulting in a stream of warnings printed out when used with Python < 2.7 (these warnings default to disabled on version 2.7 and above.) (Bitbake rev: 0a2378237f07eb1c812e2308e64b7d70781e2b39) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: fix traceback in show-overlayed with nothing overlayedPaul Eggleton2012-03-201-1/+1
| | | | | | | | | | There is no logger.note, use logger.plain instead (which is what we really want here anyway.) (Bitbake rev: c4f7fd708c48d4323db4bbeb3074f576f5be7aa2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: add copyright noticePaul Eggleton2012-02-091-0/+3
| | | | | | | | | | This ought to have been added earlier. (I consulted with Chris Larson on the notice covering his work.) (Bitbake rev: 69ed02b645bdc28c1bf24e436beeed37d226b56b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: list overlayed classes in show-overlayedPaul Eggleton2012-02-011-0/+47
| | | | | | | | | | | | Classes (.bbclass files) can be overlayed in a layer although they are currently located by BitBake in a different way (via BBPATH instead of using layer priority) and thus it is useful to be able to see when this is in effect and which layer's class is actually being used. (Bitbake rev: f6493e4bad005a82580380d800ebf4c438292f5b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: add show-recipes subcommandPaul Eggleton2012-02-011-5/+52
| | | | | | | | | | | | | Add a show-recipes subcommand which lists all available recipes, with the layer they are provided by. You can optionally filter the output by recipe name (PN). (This is a generalised version of the show-overlayed subcommand.) (Bitbake rev: 05e86ba966f5a26721891c82b21afa48768a67cc) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: improve show-overlayed outputPaul Eggleton2012-02-011-11/+105
| | | | | | | | | | | | | | | | | | | | | | Make the following improvements to the show-overlayed subcommand: * Show recipes that are overlayed when the version is higher or lower, not just when it is the same. This gives a much better picture of the influence each layer is having over the metadata used for building. This can be disabled with the -s option if you just want to see recipes with the same version as before. * Default to showing name (PN), layer and version rather than the full path and filename. The old style formatting can be used by specifying the -f option. * Mark skipped recipes as such in the output, and print them in the correct sorted place in the list rather than at the end * Prefix/suffix title line with === so it can be filtered out easily in shell scripts if desired (Bitbake rev: 43b473275d3cb2e60a14e4a52cdc4654b3f4e5e7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: use directory name as layer namePaul Eggleton2012-02-011-19/+20
| | | | | | | | | | | | | | | | | | | It turns out that using the collection name as specified within layer.conf (i.e. what gets added to BBFILE_COLLECTIONS) as a name to refer to the layer is not particularly useful, since layer creators aren't necessarily setting these to a meaningful value - e.g. OE-Core uses "normal", meta-oe uses "openembedded-layer", etc. In any case, BitBake uses the directory name in its list of configured layers in the system information presented upon starting a build, so let's just do the same here and avoid confusion. Also rename the get_append_layer function to get_file_layer since it is in no way specific to bbappends. (Bitbake rev: 35d2c1c618826e961dbf4b9889b829f469346d74) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: use dashes in subcommandsPaul Eggleton2012-02-011-5/+7
| | | | | | | | | | | Rather than the slightly awkward underscores, use dashes in subcommands e.g. show-layers instead of show_layers. (The old underscored forms continue to be accepted however.) (Bitbake rev: 6d311ddc1be04ae5bd0a1ebee94b44968e8a3f27) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: close files in apply_append()Paul Eggleton2012-01-101-0/+2
| | | | | | | | | | It's recommended practice to close files when finished with them and the code in this function was not doing this. (Bitbake rev: 470a160813ce6cf04f83258d46ded5c2ab8bc520) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: flatten: warn the user if output structure is incorrectPaul Eggleton2012-01-101-0/+38
| | | | | | | | | | | | | | | | | | If you flatten layers that have different directory structures you may not end up with a usable layer in the output directory - some files won't be picked up by BitBake. To try to avoid this problem, once flattening has completed, get the BBFILES entries that correspond to the layer from which the output layer's conf/layer.conf came from, and check through all of the .bb/.bbappend files in the output directory to see if any will not be referred to by BBFILES in the output layer. If any are found, show a warning to the user. (Bitbake rev: 8e4dc97614f2022855143b49d18795ca0352b237) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: flatten: allow specifying layers to flattenPaul Eggleton2012-01-101-8/+67
| | | | | | | | | | | | | | | | | | You can now optionally specify two or more layers to flatten into the output, rather than flattening all of the layers in the current configuration (but this is still the default behaviour if no layers are specified). Note that this means the output layer may still contain bbappends where the corresponding recipes are not present in the list of layers to flatten. There is also a caveat when a layer not being flattened would be "inbetween" the flattened layers (see the command help for details.) Implements feature request in [YOCTO #1564]. (Bitbake rev: 379b12107ec921b4458eda320078374a509164c1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: fix Python error during parsePaul Eggleton2012-01-041-0/+1
| | | | | | | | | | | | | | | | | | If "bitbake-layers show_layers" was run when the cache was dirty forcing a parse, it failed with the following error: ERROR: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception AttributeError: 'module' object has no attribute 'fetch2' A simple import of bb.fetch2 in bitbake-layers fixes this. Fixes [YOCTO #1855]. (Bitbake rev: a228f0a32c2c14d62effbbba5f4fada4cd3817f6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Ensure only the filtered environment variables are inherited from the OSJoshua Lock2011-08-151-3/+3
| | | | | | | | | | | | | | | | | | The recent change which modified inheritFromOS to use the intial environment, rather than the current environment, introduced a bug such that variables which had been cleaned from the environment where still set in the data store. This patch changes things such that a list of approved environment variables is saved after the environment is cleaned and only the variables in this list are inherited in inheritFromOS. CC: James Limbouris <james.limbouris@gmail.com> CC: Chris Larson <clarson@kergoth.com> (Bitbake rev: cb6c07054e8baf94614713ec257c643b22266d75) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: extend show_layersPaul Eggleton2011-08-151-1/+14
| | | | | | | | | | Make show_layers print layer name, path, and priority in a simple table rather than just the value of BBLAYERS. (Bitbake rev: 29afbf10c00b5ccdd8d2c063dda3f3e2b6aa1624) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: use logger.plain instead of infoPaul Eggleton2011-08-151-14/+20
| | | | | | | | | | | | | The INFO: prefix makes sense in bitbake itself but in bitbake-layers is just noise. Changing this exposed the fact that the logger was not being set up correctly (which should be done anyway to correctly support logging from BitBake), so this has also been fixed. [RP: Sync with logging changes] (Bitbake rev: 79751524cb1f0388975c6228f8c112e6af80f154) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake-layers: show help with no command specifiedPaul Eggleton2011-08-151-5/+2
| | | | | | | | | | | | Instead of running show_appends when no command is specified, show the default help text. Running show_appends by default made sense previously when that was the only real command provided, but now we have several useful commands implemented. (Bitbake rev: 62a2e0aa1ac8a459928d1f72783b6ca9c1756350) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-05 06:28:02 +0000