summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* maintainers: Add entry for new recipe libdazzleRichard Purdie2018-11-221-0/+1
| | | | | | (From OE-Core rev: c80972be1f3592d797da9eb0845b739420c6da4a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gtk+3: update to 3.24.1Alexander Kanavin2018-11-222-55/+52
| | | | | | | (From OE-Core rev: d76fa906dd603bd8eadd1932048969065ebd3aab) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libdazzle: add recipeAlexander Kanavin2018-11-221-0/+17
| | | | | | | | | This is a new requirement of epiphany web browser. (From OE-Core rev: 7bce6eb66749b7f773c24868cf85ebfcda8d636b) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* epiphany: update to 3.30.2Alexander Kanavin2018-11-221-3/+3
| | | | | | | | | libdazzle is a new requirement (From OE-Core rev: 2a02ed07785dc68045c746d350199702856e6d8d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* webkitgtk: update to 2.22.3Alexander Kanavin2018-11-226-141/+40
| | | | | | | | | | | | | Remove upstreamed patches. Add a tweak to 0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch for Javascriptcore gir file (previously it was pre-compiled in tarballs). Rebase 0001-Fix-build-with-musl.patch (From OE-Core rev: 7cd49245249f5c20579d1bb3992d60f3ed40708c) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_manager.py: fix the message used to catch failing postinsts from dnfAlexander Kanavin2018-11-221-1/+1
| | | | | | | | | Latest dnf versions have tweaked it. (From OE-Core rev: 477db7cf4a6a0d06554c9d1539a01fed7c5cb389) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libcomps: add a patch to fix the missing crc32 symbol error under muslAlexander Kanavin2018-11-222-0/+48
| | | | | | | (From OE-Core rev: 73faaea3cc0f26052cd4e2422106c6243fb676b1) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* dnf: update to 4.0.4Alexander Kanavin2018-11-223-24/+18
| | | | | | | | | License-Update: spelling fixes (From OE-Core rev: f03c0f06e14d18a5ed263e943e36920d70796db9) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libsolv: update to 0.7.1Alexander Kanavin2018-11-221-1/+1
| | | | | | | (From OE-Core rev: 425f8a83a47c013beb6303b88dda4c727d173ab9) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* librepo: update to 1.9.2Alexander Kanavin2018-11-223-27/+16
| | | | | | | | | expat dependency has been replaced by libxml (From OE-Core rev: 6eeda04126009d5ab216d8178d8cbb0a22318bc5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: update to 4.14.2.1Alexander Kanavin2018-11-221-1/+1
| | | | | | | (From OE-Core rev: fc6951e46dcdce0af7861ffa78fe54426d5cb439) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libdnf: update to 0.22.0Alexander Kanavin2018-11-226-88/+66
| | | | | | | (From OE-Core rev: 35c163f6ebdc41eb6b65fca05706854b1aac20b5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: tests/fetch: Update after recent gitsm message changesRichard Purdie2018-11-221-3/+2
| | | | | | | | Also use assetIn instead of assertTrue which aids debugging failures. (Bitbake rev: 19dee675bb9ad012d28e1e57a888931355a831cb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: fetch/git: fix AttributeError in shallow extraction logicChristopher Larson2018-11-221-5/+8
| | | | | | | | | | | | | | | This code checks to see if shallow is either disabled or the tarball is missing, but the else block tries to print the tarball filename, and this attribute doesn't exist at all when shallow is disabled. Handle the two cases separately to give sane errors for both cases without the exception: Exception: AttributeError: 'FetchData' object has no attribute 'fullshallow' (Bitbake rev: bdbb558342ebb4e64384c9838d2485d9299d91a6) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: cooker: Fix multiconfig dependenciesAlejandro Enedino Hernandez Samaniego2018-11-221-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | When multiconfig is enabled the cooker adds providers for all the targets to be built on all the multiconfig variables that were set, regardless if there is a dependency to it or not. This causes an issue when a certain target is incompatible with one or more of the multiconfigs, e.g. the target is not in COMPATIBLE_MACHINE for one of the MACHINEs being built, causing the cooker to error out since no providers can be found for that certain target on that multiconfig. This patch modifies the behavior to only look for PROVIDERS for a target on the multiconfig that was selected to be built, PROVIDERS are then looked for in other multiconfigs only when there is a defined dependency to them. [YOCTO #12985] (Bitbake rev: f2106a3a767542359fdde238abcf5fe35ab3a144) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* poky.conf: Include SDKMACHINE in SDK nameJoshua Watt2018-11-211-1/+1
| | | | | | | | | | | | | | | Replace SDK_ARCH with SDKMACHINE so that SDK targeting different development machines but having the same architecture don't cause similar errors as found in '3614dd4aee9 ("poky.conf: Add MACHINE to SDK_NAME")' This doesn't have any effect on the SDK machines provided in oe-core, since SDK_ARCH is the same as SDKMACHINE for all of them. (From meta-yocto rev: 951184fd62b3ab14266f300defd47d3c5c09ad9b) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* poky.conf: Add MACHINE to SDK_NAMERichard Purdie2018-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid errors from: MACHINE=qemux86-64 bitbake core-image-sato:do_populate_sdk then: MACHINE=genericx86-64 bitbake core-image-sato:do_populate_sdk which gives: ERROR: core-image-sato-1.0-r0 do_populate_sdk: The recipe core-image-sato is trying to install files into a shared area when those files already exist. Those files and their manifest location are: deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.host.manifest (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk) deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.testdata.json (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk) deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.target.manifest (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk) deploy/sdk/poky-glibc-x86_64-core-image-sato-core2-64-toolchain-2.6+snapshot.sh (matched in manifest-qemux86_64x86_64-core-image-sato.populate_sdk) Please verify which recipe should provide the above files. Adding MACHINE to the artefact name will avoid this. The issue was highlighted by changes to the autobuilder configuration. (From meta-yocto rev: 3614dd4aee9d19f1024edb6a36b2862c2d726c04) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: fetch2/npm.py: Allow shrinkwrap resolved relative URL which ↵Parthiban Nallathambi2018-11-211-1/+1
| | | | | | | | | | | | | | | | | startswith 'http' (e.g http-proxy) shrinkwrap resolved relative URL can start with http. For example, "resolved: http-proxy/-/http-proxy-${PV}.tgz" is still relative URL to npm registry, but starts with http. Current if statement compares the startswith 'resolved' to 'http', which makes impossible to use npm download. Condtional comparison now strictly checks for "http://" and "https://" (Bitbake rev: f76075aa1a5159fd4d62949cb588346888b9fe60) Signed-off-by: Parthiban Nallathambi <pn@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/icecc.bbclass: Update system blacklistsJoshua Watt2018-11-211-0/+8
| | | | | | | | | | Updates the system blacklists to include packages that are known to have problems compiling under icecream (From OE-Core rev: fc5418e7bbdecfb27bafe595084e0fd0f991a388) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/icecc.bbclass: Move system blacklist to variablesJoshua Watt2018-11-211-11/+20
| | | | | | | | | | | The system blacklists are moved to variables which are ignore when hashing. This prevents changes to the blacklists from causing all taskhashes to change (and thus rebuild). (From OE-Core rev: f5be9f6e9180ace3362bba52c7ced3b039441d7d) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xcb-proto: use python3native to have reproducible pyc filesRoss Burton2018-11-211-24/+2
| | | | | | | (From OE-Core rev: 7709b2551c07cfad591bb37817474fd106e7c2f1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* json-glib: add ptestRoss Burton2018-11-212-5/+10
| | | | | | | (From OE-Core rev: c33e9b5a6ecd43796ff88e44f68b122248145aa0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libinput: 1.12.1 -> 1.12.3Ross Burton2018-11-211-2/+2
| | | | | | | (From OE-Core rev: fe627bbff2bf772bc3e7a58262ec1b6431f65222) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* harfbuzz: upgrade 1.9.0 -> 2.1.3Ross Burton2018-11-211-2/+2
| | | | | | | (From OE-Core rev: aee2d09a18d42ed0bff582629f3b21d16e681f93) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ltp: Use a legal bad address for mips in setrlimit05.cHongzhi.Song2018-11-212-0/+62
| | | | | | | | | | | | | | | | | This testcase fails on mips32. The process is killed by SIGBUS which is not as expect. This is because: ((void *)-1) is not a legal bad address which causes the process killed by SIGBUG on mips. 'tst_get_bad_addr()' returns an address that should works on mips and other arches. (From OE-Core rev: e45948d4be14c14eff0a5c8c8597a7523f2edff1) Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ltp: Delete unneeded patch for FNM_EXTMATCHDaniel Díaz2018-11-212-45/+0
| | | | | | | | | | The patch in question was reworked, merged and released by upstream version 20180926, as commit 822ad2043379. (From OE-Core rev: 6ad99f3eabe359d5be98d63d4781063b63c83eea) Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* maintainers.inc: add libmodulemd entryAlexander Kanavin2018-11-211-0/+1
| | | | | | | (From OE-Core rev: bdeb0277c084ac4ecfa21bd77d318a9b0c39616d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libmodulemd: add a new recipeAlexander Kanavin2018-11-213-0/+107
| | | | | | | | | This is a hard requirement of the new libdnf versions. (From OE-Core rev: 4b53d713523f56994beb4a7b5dbb3347c8713e42) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/testsdk: Split implementation into classesJoshua Watt2018-11-213-202/+261
| | | | | | | | | | | | | | | | | | | | | | | | | Splits the SDK test implementation into configurable Python classes. The classes used for the normal and extensible SDKs are ${TESTSDK_CLASS_NAME} and ${TESTSDKEXT_CLASS_NAME} respectively. This allows SDK machines to override the classes used to implement the tests. For the traditional SDK, a common "run()" function is provided by the class (oeqa.sdk.testsdk.TestSDK), with several hook member functions that can be overridden in child classes, making it easier to have consistent behavior. The extensible SDK class (oeqa.sdkext.testsdk.TestSDKEXT) also has a common "run()" function, but no hooks have yet been added as there is not currently a known use case for create derived classes. These changes should be purely organizational; no functional changes have been made to either the standard SDK or extensible SDK tests. [YOCTO #13020] (From OE-Core rev: a06d53928b22d5f88276023c4d57b206db2f27f9) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* apt: Improve SRC_URIRichard Purdie2018-11-201-1/+1
| | | | | | | | Use PV and BPN in SRC_URI as a minor improvement. (From OE-Core rev: 19c9842644b7b0a599437fd394111f161c8b1f1e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pseudo: fix link of sqlite3 using pkg-configJens Rehsack2018-11-203-37/+16
| | | | | | | | | | | | | | | | If sqlite3 is built with FTS5 it uses log() from libm, it sqlite3 is built with READLINE it uses tgetent from a curses lib and readline from libreadline, if it is built using deflate from libz ... , but all that linkage is lost if we manually statically link so explicitely extract extra static linking options from pkg-config and force them into pseudo as well. This commit obsoletes (so include the implicit revert) e39fec613d pseudo: fix link with new sqlite3 (From OE-Core rev: 042af406583acc091ef82c3d1dcedd41315046de) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sqlite3: Update 3.25.2 -> 3.25.3Jens Rehsack2018-11-202-4/+12
| | | | | | | | | | | | | | | | | | | | | | Update SQLite3 from 3.25.2 to 3.25.3 to fix following issues: * Disallow the use of window functions in the recursive part of a CTE. * Fix the behavior of typeof() and length() on virtual tables. * Strengthen defenses against deliberately corrupted database files. * Fix a problem in the query planner that results when a row-value expression is used with a PRIMARY KEY with redundant columns. * Fix the query planner so that it works correctly for IS NOT NULL operators in the ON clause of a LEFT JOIN with the SQLITE_ENABLE_STAT4 compile-time option. Also introduce PACKAGECONFIG tunables to enable/disable e.g. index and search functions to allow shrinking the library for very small targets. (From OE-Core rev: d533ad9b93383a8d721b72b4030b112a3799d559) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: backport fix to stop enabling ECNAlex Kiernan2018-11-202-0/+37
| | | | | | | | | | | | | | >From upstream: Turning on ECN still causes slow or broken network on linux. Our tcp is not yet ready for wide spread use of ECN. https://github.com/systemd/systemd/issues/9748 (From OE-Core rev: f951aa6f9fcf318f108ecdc3371498ee2e919e68) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* go-target.inc: fix go not found while multilib enabledHongxu Jia2018-11-201-1/+1
| | | | | | | | | | | | Go binaries were installed to ${libdir}/go/bin, and create symlink in ${bindir}, while enabling multilib, libdir was extended (such as /usr/lib64), but BASELIB was not (still /lib), so use baselib (such as /lib64)) to replace (From OE-Core rev: 8b69af74c377bc9342f631d7e6b90fe05876216c) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gobject-introspection: port cross-compilation support to mesonAlexander Kanavin2018-11-203-11/+185
| | | | | | | | | | Also add a missing libdl dependency to the native relocation patch, which was not necessary with autotools. (From OE-Core rev: ff3f8d4fde8a1d07f5b5381546e740efa14fd483) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meson: do not manipulate the environment when looking for python via pkg-configAlexander Kanavin2018-11-202-0/+44
| | | | | | | | | meson does it in a way that breaks oe builds (they export a bunch of PKG_CONFIG_ variables) (From OE-Core rev: f071c5eb0a46b8ac5424c5baeb471a8080d4a078) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kexec-tools: update to 2.0.18Armin Kuster2018-11-202-44/+2
| | | | | | | | | | Drop patch included 0001-kexec-fix-for-Unhandled-rela-relocation-R_X86_64_PLT.patch (From OE-Core rev: fd2a682812bf5b3e1bdb6571e965b1b9aeb54817) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libx11: move hashes to incArmin Kuster2018-11-203-6/+3
| | | | | | | | | | This should help keep libx11 and libx11-diet in sync by throwing an error when building (From OE-Core rev: 5d5434e77c60faa78f15c99714e34221d154617b) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libx11-diet: update to 1.6.7Armin Kuster2018-11-201-2/+2
| | | | | | | (From OE-Core rev: b9bc0ab578d86baa2d7e1988b0c3485bc7a632a3) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nss: update to 3.40Armin Kuster2018-11-201-2/+2
| | | | | | | | | see: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.40_release_notes (From OE-Core rev: 56715665cc264083fdcb184f06d08f391b06c1c6) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* curl: update to 7.62.0Armin Kuster2018-11-205-156/+2
| | | | | | | | | | | Drop all CVE patches now included in update. For details see: https://curl.haxx.se/changes.html (From OE-Core rev: 43a802c2605cd2f6095a7738347338492eafe722) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lttng-tools: Upgrade 2.9.5 -> 2.10.5 and improve ptestRichard Purdie2018-11-202-47/+26
| | | | | | | | | | | | | | | | | | | A backported patch was removed. The kmod option changed format in the new version so was adjusted accordingly. The ptest package was improved to resolve failures in the tests/unit/ directory but disabling attempts to rebuild the binaries on target. Various ptest libtool script wrappers are now replaced with real binaries and since the test suite knows about these paths for dymanic libraries, we put links in place for those. A data file needed by one of the tests is also copied in. (From OE-Core rev: fbafcd9a0101a637181d0aa9ec14579309a9bddf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lttng-tools: Improve ptest robustnessRichard Purdie2018-11-201-1/+1
| | | | | | | | | | | | | | | | There are some fatal make errors that occur from the current ptest for lttng-tools however since other tests are successful, those make build failures were being ignored. When upgrading, the order of test execution changed and the ptest failed fatally straight away with the same errors. Passing -k to make means it will try and run all the tests making the test suite run more consistently over all lttng-tools versions. (From OE-Core rev: 3113fb0812aba96df59fca58fe68b751d1d886e6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nasm: Couple of recipe cleanupsRichard Purdie2018-11-201-9/+2
| | | | | | | | | | | | The do_install now matches that from autotools.bbclass. Document that brokensep is still needed. Use a better form of handling of aclocal.m4 (From OE-Core rev: ef25d9bb18b3a26eefe7fc0c2d7003578c55f416) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nasm: Upgrade 2.13.03 -> 2.14Richard Purdie2018-11-208-284/+25
| | | | | | | | | | | | The patches are all backports or have equivalent changes in the new release so can be dropped. Upstream reworked the install handling to use DESTDIR instead of INSTALLROOT and we no longer need to create directories. (From OE-Core rev: ac9b892f06237a384a60d0404e6ed0afd63c1005) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: BBHandler: Fix __python_func_regexp__ for comment linesRobert Yang2018-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed: - Add a comment in base.bbclass: def oe_import(d): import sys # Comment bbpath = d.getVar("BBPATH").split(":") [snip] Note, '# Comment' is started with '#', it is legal in python's syntax (though maybe not a good style), but bitbake reported errors: $ bitbake -p ERROR: ParseError at /path/to/base.bbclass:20: unparsed line: ' bbpath = d.getVar("BBPATH").split(":")' This error report would mislead people, the real problem is that '# Comment' is not supported, but it reports the next line, this may make it hard to debug the code are complicated. We can make __python_func_regexp__ handle '^#' to fix the problem, since it already can handle blank line "^$" in a python function, so it would be pretty safe to handle "^#" as well. (Bitbake rev: 79e62eef1c93f742bf71e9f25db57fdd2ffedd02) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: server/process: print a message when no logfileRobert Yang2018-11-191-0/+4
| | | | | | | | | | | [YOCTO #12898] There might be no bitbake-cookerdaemon.log, print a message for debugging. (Bitbake rev: 4adc582d2df7fdb9e51c4ebb5e66bbd21165b4dc) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: data_smart: fix filename for compile()Robert Yang2018-11-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed: Add the following two lines to conf/local.conf: FOO = "${@foo = 5}" HOSTTOOLS += "${FOO}" * Before the patch $ bitbake -p Check the first lines of bitbake bitbake-cookerdaemon.log [snip] File "/buildarea1/lyang1/poky/bitbake/lib/bb/data_smart.py", line 125, in python_sub codeobj = compile(code.strip(), self.varname or "<expansion>", "eval") File "FOO", line 1 [snip] There isn't a file named 'FOO', but a variable name. * After the patch $ bitbake -p [snip] File "/buildarea1/lyang1/poky/bitbake/lib/bb/data_smart.py", line 129, in python_sub codeobj = compile(code.strip(), varname, "eval") File "Var <FOO>", line 1 foo = 5 (Bitbake rev: 540b546be55e0f5f5d91695956da3a7732b2f90a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: data_smart: Add original traceback to ExpansionErrorRobert Yang2018-11-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can make it print clearer errors, for exmaple: Add Runtime_error to 'def oe_import(d)" 16 def oe_import(d): 17 import sys 18 Runtime_error [snip] * Before the patch: $ bitbake -p ERROR: Unable to parse /buildarea1/lyang1/poky/bitbake/lib/bb/data_smart.py Traceback (most recent call last): File "/buildarea1/lyang1/poky/bitbake/lib/bb/data_smart.py", line 430, in DataSmart.expandWithRefs(s='${@oe_import(d)}', varname='OE_IMPORTED[:=]'): except Exception as exc: > raise ExpansionError(varname, s, exc) from exc bb.data_smart.ExpansionError: Failure expanding variable OE_IMPORTED[:=], expression was ${@oe_import(d)} which triggered exception NameError: name 'Runtime_error' is not defined This error message has two problems: - "Unable to parse data_smart.py": This isn't the real cause. - It pionts to "raise ExpansionError(varname, s, exc) from exc" which isn't clear enough. * After the patch: $ bitbake -p ERROR: Unable to parse OE_IMPORTED[:=] Traceback (most recent call last): File "OE_IMPORTED[:=]", line 1, in <module> File "/buildarea1/lyang1/poky/meta/classes/base.bbclass", line 18, in oe_import(d=<bb.data_smart.DataSmart object at 0x7f9257e7a0b8>): import sys > Runtime_error bb.data_smart.ExpansionError: Failure expanding variable OE_IMPORTED[:=], expression was ${@oe_import(d)} which triggered exception NameError: name 'Runtime_error' is not defined This one is more clearer than before. (Bitbake rev: c0fe524c1aeccb24ddd2e1f7bf235c00fdbf79a7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: parse/ast: fix line number for anonymous functionRobert Yang2018-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed: - Define an error anonymous function in base.bbclass: 15 16 python() { 17 Compile error 18 } $ bitbake -p ERROR: Error in compiling python function in /buildarea1/lyang1/poky/meta/classes/base.bbclass, line 18: The code lines resulting in this error were: 0001:def __anon_18__buildarea1_lyang1_poky_meta_classes_base_bbclass(d): *** 0002: Compile error 0003: SyntaxError: invalid syntax (base.bbclass, line 18) The lineno should be 17, but it reported 18, this would mislead people a lot when there more lines. - Now fix it to: ERROR: Error in compiling python function in /buildarea1/lyang1/poky/meta/classes/base.bbclass, line 17: The code lines resulting in this error were: 0001:def __anon_18__buildarea1_lyang1_poky_meta_classes_base_bbclass(d): *** 0002: Compile error 0003: SyntaxError: invalid syntax (base.bbclass, line 17) This is because the anonymous function is constructed by: text = "def %s(d):\n" % (funcname) + text The len(self.body) doesn't include the "def " line, the length of the function should be "len(self.body) + 1", so we need pass "self.lineno - (len(self.body) + 1)" which is the same as 'self.lineno - len(self.body) - 1' to bb.methodpool.insert_method() as we already had done to named function. Otherwise, the lineno is wrong, and would cause other problems such as report which line is wrong, but the line is not what we want since it reports incorrect line. (Bitbake rev: 7466c8765fcc792e5ea3daefda3c5895e782d6c4) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>