linux/poky.git/scripts/lib/recipetool, branch rocko

recipetool: create: fix conflict between SRCREV and tag

2018-01-06T10:13:56+00:00

If you specify 'tag=' for a git URL and passed to recipetool create, you will get into Bitbake expansion error shown below: ----- snip ----- $ devtool add --version 2.4.2 mbedtls "git://github.com/ARMmbed/mbedtls;tag=mbedtls-2.4.2" ... bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher failure: Conflicting revisions (abeccb9dbd7e19ae91ac50e1edd3803111c5f9b6 from SRCREV and mbedtls-2.4.2 from the url) found, please specify one valid value ----- snip ----- Assuming the tag is valid, we should get the tag commit hash and drop the usage of 'tag=' from SRC_URI. By using a commit hash corresponding to the tag will prevent bitbake from accessing remote repository in order to expand SRCPV. (From OE-Core rev: 4953d54dd06ff7025406d2df6a71c95162cc1ec7) Signed-off-by: Chang Rebecca Swee Fun Signed-off-by: Ross Burton (cherry picked from commit 53f8effa3eb07dc7035ff9933e7918318f242579) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

recipetool: create: fix failure handling included dicts

2017-12-04T17:23:59+00:00

If a setup dict in a python setup.py file pulled in the contents of another dict (e.g. **otherdict), then we got an error when mapping the keys because the key is None in that case. Skip those keys to avoid the error (we pick up the values directly in any case). A quick reproducer for this issue: recipetool create https://files.pythonhosted.org/packages/source/p/pyqtgraph/pyqtgraph-0.10.0.tar.gz (From OE-Core rev: 49b2d571da88fb2afce71835276523ed3538d31f) Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton (cherry picked from commit ae62a9953e219df5147ed4a5ae3f4163d51cff28) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

recipetool: ignore incidental kernel module source

2017-12-04T17:23:58+00:00

If the source tree happens to contain a kernel module as an example, a test or under a "contrib" directory then we shouldn't be picking it up and making the determination that the entire thing is a kernel module. An example that triggered this is zstd, which ships a kernel module under contrib/linux-kernel: https://github.com/facebook/zstd (From OE-Core rev: 5c89bd0db1b327483f674802740ff21b909e0876) Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

recipetool: pass absolute source tree path to plugins

2017-12-04T17:23:58+00:00

We shouldn't be passing a relative path to the plugins if that's what's been specified on the recipetool command line. (From OE-Core rev: 821742f48723a66fdafe5406bb57188b2f88889a) Signed-off-by: Paul Eggleton Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie

devtool/standard: set a preferred provider when adding a new recipe with devtool

2017-09-13T21:07:42+00:00

A recipe added with "devtool add" requires to be able to take precedence on recipes previously defined with PREFERRED_PROVIDER. By adding the parameter "--provides" to "devtool add" it is possible to specify an element to be provided by the recipe. A devtool recipe can override a previous PREFERRED_PROVIDER using the layer configuration file in the workspace. E.g. devtool add my-libgl git@git://my-libgl-repository --provides virtual/libgl [YOCTO #10415] (From OE-Core rev: adeea2fe6895898a5e6006e798898f0f5dabd890) Signed-off-by: Juan M Cruz Alcaraz Signed-off-by: Ross Burton Signed-off-by: Richard Purdie

recipetool: create: detect Eclipse licenses

2017-08-31T22:30:02+00:00

Add detection of EPL 1.0 and EDL 1.0 license files. (From OE-Core rev: 41e7580991f8ad77a57eb7fd292e39f1583109f6) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

recipetool: create: suppress npm shrinkwrap/lockdown warnings again

2017-08-31T22:30:02+00:00

Since OE-Core revision 9a47a6690052ef943c0d4760630ee630fb012153 the mechanism we were using to suppress the warnings about NPM_LOCKDOWN and NPM_SHRINKWRAP not being set on the first fetch of the source is no longer available since we are using the normal fetch/unpack tasks to do the job. Use the newly added noverify parameter to suppress the warnings again. (From OE-Core rev: cb083b6f5f6e909b7c85548bcb1a92ca34d0c18a) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

recipetool: create: fix SRCPV prefix for non-git SCMs

2017-08-31T22:30:02+00:00

If you're fetching from an SCM other than git (for example subversion or mercurial) then we need to use a different prefix for the SRCPV in PV instead of +git. (From OE-Core rev: ad1200c8729f21b325d347649f9dd5e5598de93e) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

recipetool: create: make recently added branch/tag handling git specific

2017-08-31T22:30:02+00:00

The branch and tag handling code that was recently added in OE-Core revs ecca596b75cfda2f798a0bdde75f4f774e23a95b and 3afdcbdc9a3e65bc925ec61717784ffec67d529d is specific to git, so only apply it when we're fetching from a git URL. (From OE-Core rev: 5d4bfe6cf788ce971a2e9419bc13492153023681) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

devtool: add: add explicit srcrev/branch options

2017-08-31T22:30:02+00:00

At the moment when fetching source from a git repository you have to know that you can specify the revision and branch in the URL with ';rev=' and ';branch=' respectively, and you can also get thrown off by the shell splitting on the ; character if you forget to surround the URL in quotes. Add explicit -S/--srcrev and -B/--srcbranch options (consistent with devtool upgrade) to make this easier for the user to discover and use. (The rev and branch URL parameters will continue to work, however.) (From OE-Core rev: 2d86cac853d6daa496c0315a5cb0662ebf1165b0) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie