linux/poky.git/scripts/lib/devtool, branch fido-13.0.2

lib/devtool/standard: Fix patch cleanup

2015-07-08T12:07:15+00:00

If patches fail to apply with git, quilt it used as a fallback. If that happens, the code in this class is meant to handle cleanup of these patch files. In the case where ${S} is a subdir of the git tree, the code doesn't correctly set the patches directory. This change correctly sets the patches directory (which is different to the location of the git repository). [YOCTO #7911] (From OE-Core master rev: de6e0f3af5e858960676ea291036e59105fd806f) (From OE-Core rev: 03dbc60c165a511894d1ae10ac1d90c1fadcc268) Signed-off-by: Richard Purdie Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie

devtool: fix build env command execution error handling

2015-06-28T08:44:15+00:00

If we execute an external command, we ought to prepare for the possibility that it can fail and handle the failure appropriately. We can especially expect this to happen when running bitbake in this scenario. Ensure we return the appropriate exit code to the calling process. Fixes [YOCTO #7757]. (From OE-Core master rev: 98a716d79bfc5434a5b42d3ca683eab3eea30a41) (From OE-Core rev: 2791fe9236f7173e6b998cf9b40fe238566ed8ee) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

recipetool: ensure git clone is standalone when extracting

2015-06-28T08:44:15+00:00

If -x is specified and the specified URI was a git repository, we need to ensure that the resulting clone is a sandalone and not one that has pointers into the temporary fetch location or DL_DIR (since the git fetcher does a local clone with -s). Split out the code from devtool that already does this for "devtool modify -x" and reuse that. (From OE-Core master rev: fc47e8652ef32e7399f57c80593df90dc52d8b84) (From OE-Core rev: d8f151b6a385f81abead65624ba15d42cbd90e11) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

devtool: update-recipe: check if source tree is a git repository

2015-06-28T08:44:14+00:00

If you've done "devtool add" (or "devtool modify" without -x) then it's possible that the external source tree is not a git repository, so we should handle that case here instead of printing a traceback. (From OE-Core master rev: eb2147aa8facd4ef33a0749e9ae660ec686dad48) (From OE-Core rev: c5dc3e819c1bb224e3cb667381faa5abf1888362) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

devtool: update-recipe: handle unversioned bbappends

2015-06-28T08:44:14+00:00

Use the proper bbappend file name, don't just assume it will have a version suffix (because it won't if the original recipe doesn't). Fixes [YOCTO #7651]. (From OE-Core master rev: 3332d68ef7b2a300ce8dcf5021497d98e5b17baa) (From OE-Core rev: 3d5ea16a1f53c12d86c4e8df6af864964541cf02) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

devtool: add: use correct bbappend file name with -V option

2015-06-28T08:44:14+00:00

We weren't adding the version into the bbappend file name when -V was specified which meant that building or resetting failed. Also adjust one of the tests so that we're testing devtool add both with and without this option. Fixes [YOCTO #7647]. (From OE-Core master rev: bdbeff0cd342e31053d7203d78fc5dda611052b1) (From OE-Core rev: 0b9e8817fc8ba375a1045a66d04b3fd2b498427b) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

devtool: include bbappends in recipe parsing

2015-06-28T08:44:14+00:00

In order to get correct metadata, SRCREV for example. Fixes [YOCTO #7648]. (From OE-Core master rev: 8b1794559dd7fd956716179d628e61cffdce1686) (From OE-Core rev: becbd5d50a091fe4a980361d9c99efa01f43edcc) Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie

devtool: modify: implement --no-same-dir

2015-06-28T08:44:14+00:00

This option can be used to have a separate build directory, in order to keep the srctree directory clean for packages that do not need to be built in the source directory. (From OE-Core master rev: 5cc348c0a3016e4ccc1e80d099e2e197b3b38bd2) (From OE-Core rev: a7316a4c564901b30af740ece6631a6f68355bb4) Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie

devtool: modify: use B=S if that is the default for the recipe

2015-06-28T08:44:14+00:00

Makes the build succeed for packages which do not support separate build directory, e.g. zlib. The same outcome could be achieved with the --same-dir option, but, it's generally hard to tell if a random package would need that option. The negative side effect of this patch is that dev srctree (of some packages that build fine without this modification) gets dirtied by build artefacts. (From OE-Core master rev: 6ac5692426956e276ba2119f917b0f30791e6cd6) (From OE-Core rev: 97078c56e8b8a235e923d964253775e20112a36f) Signed-off-by: Markus Lehtonen Acked-by: Paul Eggleton Signed-off-by: Richard Purdie

devtool: call parse_recipe with correct arguments

2015-06-28T08:44:14+00:00

Give the correct data object ("config data" instead of "recipe data") as an argument to oe.recipeutils.patch_recipe() Fixes [YOCTO #7595] (From OE-Core master rev: 7d2b918019b0afe215a6489dad697afac34f73e9) (From OE-Core rev: f8427fe565e44e46246146bdaae66a5d83ae8c9d) Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie