aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
AgeCommit message (Collapse)Author
2016-07-01oeqa.buildperf: implement BuildPerfTestRunner classMarkus Lehtonen
The new class is responsible for actually running the tests and processing their results. This commit also adds a decorator function for adding new tests. No automatic test discovery, at least yet. (From OE-Core rev: bf90aecb7e150d6bfac7240286c797b79d26528b) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-01oeqa.buildperf: functionality to drop kernel cachesMarkus Lehtonen
Add a new utility class for dropping Linux kernel caches. It uses sudo and tee to write to the drop_caches file. Checking if the user has the permissions to drop caches (without a password) is done by trying to writing an invalid value to the drop_caches file. This way, we will find if writing (with tee) is possible but not really dropping caches, yet. User can avoid giving the password by adding something like: <user> ALL = NOPASSWD: /usr/bin/tee /proc/sys/vm/drop_caches to the system sudoers file. (From OE-Core rev: c9cb248429ced50c96d11ba5361c272d4c9b9323) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-01oe-build-perf-test: add pre-run sanity checkMarkus Lehtonen
The script will be required to be run in an initialized bitbake build environment. (From OE-Core rev: 1bce7b10283255a4498d11ead920c1f3b1dec4de) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-01scripts: introduce oe-build-perf-testMarkus Lehtonen
Initial wireframe for re-writing build-perf-test.sh in Python. (From OE-Core rev: 764eb2d011305b84501cc183531a2a5353b0b5ab) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-01recipetool: recognize less common makefile namesNathan Lynch
GNU make looks for "makefile" and "GNUmakefile" in addition to "Makefile", so add these other names to the heuristic for detecting a make-based project. (From OE-Core rev: 204d19b02265e5b2241888e4c92c0a730f3d3472) Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-01test-dependencies.sh: Strip also '\.bb; .*' before adding failed recipe to ↵Martin Jansa
list of failed * format of bitbake tasks changed in: 2c88afb taskdata/runqueue: Rewrite without use of ID indirection -ERROR: Task 4 (/OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb, do_fetch) failed with exit code '1' +ERROR: Task /OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb:do_fetch (/OE/build/oe-core/openembedded-core/meta/recipes-devtools/rpm/sftp.bb:do_fetch) failed with exit code '1' so strip not only '\.bb, .*' used before, but also '\.bb;.*' to drop the task name to get recipe name. * for more details see: http://lists.openembedded.org/pipermail/openembedded-core/2016-June/123132.html * without this change you can see test-dependencies.sh trying to rebuild packages like: Building recipe: fbprogress (6/21) Building recipe: fbprogress.bb:do (7/21) where the later of course doesn't exist as a recipe (From OE-Core rev: b7d6d4203cf2021ee2b9b84c8faf15198bfb536d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-15scripts: ensure not specifying subcommand shows help textPaul Eggleton
With Python 2, argparse subparsers behaviour in Python 2 was to print the usage information if the subparsers argument wasn't specified. However, with Python 3.2.3 and later a subparsers argument is not required by default, leading to errors when no arguments are specified: AttributeError: 'Namespace' object has no attribute 'func' Restore the previous desired behaviour of showing the help text for devtool, recipetool and the devtool-stress script by setting subparsers.required to True. (From OE-Core rev: d36fdea1a7f32d97187e0e9e6d701ae8fa304e8f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-15devtool: reset: allow specifying multiple recipesPaul Eggleton
Allow specifying more than one recipe on the devtool reset command line. Also tweak the help text slightly. (From OE-Core rev: ad92ed8e4f7f48a3d212962531d596b36f6b284f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-15devtool: tweak README in created workspace layerPaul Eggleton
Clarify slightly the intended usage of the workspace layer. (From OE-Core rev: d9f3af6f4e6d3df30b411bbcc3c2b6f7f62c52ad) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12scripts/lib/bsp/engine.py: Added missing parentheses to string formattingHumberto Ibarra
Commit ab75075e7941c8c2ec429c180976702cd311c978 broke the string formatting for multiple arguments. Since parentheses were removed the formatting considers only first argument instead of all of them. Fixed parentheses on the formatting. [YOCTO #9723] (From meta-yocto rev: d6d641d5b4bb0c8b9acd5cd1341a4a3214bff086) Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12scripts/lib/bsp/kernel.py: python3: use explicit relative importsHumberto Ibarra
Have to convert implicit relative imports to explicit imports since implicit relative imports are not supported on python3. [YOCTO #9723] (From meta-yocto rev: 89cecc603d229768428f3cb68d21235dee80efda) Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12scripts/lib/bsp/engine.py: Rename raw_input commands to inputHumberto Ibarra
According to https://docs.python.org/3/whatsnew/3.0.html python3 renamed 'raw_input' to 'input'. Making the appropiate changes for this. [YOCTO #9723] (From meta-yocto rev: 76efeeeac7fb30b44ee7057b3b3d1fd84329dae1) Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12scripts/yocto-bsp: Fixed typo in parameter that was causing exceptionHumberto Ibarra
There is a typo in the logging parameters, "filname" is being used instead of "filename". This didn't cause issues before since python 2 didn't validate unused parameters but with python >= 3.4.3 an exception is thrown. This patch fixes this parameter name. [Yocto #9736] (From meta-yocto rev: aae5c2c39f64be87152b2e5470b50681c0f54670) Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12buildhistory-diff: suggest correct version of PythonGitEd Bartosh
If buildhistory-diff can't import git module it throws error message suggesting to install it. Due to the move to Python 3 the suggested package name and version became outdated. Changed package name to python3-git and version to >= 0.3.4 as GitPython supports Python 3 starting from 0.3.4. [YOCTO #9741] (From OE-Core rev: 0632c3e69070e340218c1c1c835b2343cd143d8d) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12oe-pkgdata-util: new option to provide full info for binary package(s)Alexander D. Kanevskiy
New option can be used for displaying full information about binary package(s), including name, full version, recipe name, recipe full version and package size. This information can be useful inside custom buildhistory class to produce detailed image manifest for further analysis. List of packages can be specified as command line arguments or can be read from file (e.g. from existing image manifest). Warning: In case of image manifest is used as input outside of build process, be aware that pkgdata might change since the time image was built. Output format: {PKG} [PKGE:]{PKGV}[-{PKGR}] {PN} [PE:]{PV}[-{PR}] {PKGSIZE} (From OE-Core rev: bc0cdaa927124150a6c38cd47977ee4da8dd440e) Signed-off-by: Alexander D. Kanevskiy <kad@kad.name> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12runqemu-internal: Update the qemuzynq boot optionsAlistair Francis
The current qemuzynq options were causing QEMU to exit instead of booting as the QEMU Zynq-7000 machine does not have virtio or display devices. (From OE-Core rev: e76f62a862a895147a89cea2519679aad337a679) Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reported-by: Arno <star@gmx.li> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-12runqemu: Add suport for qemuzynqmpAlistair Francis
(From OE-Core rev: d2a7c1db9bff6ae3844e3d017e94f29d1501bf57) Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-07oe-pkgdata-util: fix AttributeErrorEd Bartosh
The default arparse behaviour in Python 2 and early versions of Python 3 was to print usage message if no subcommands provided by user. In Python >= 3.2.3 subparser has to have attribute 'required' set to True to behave similar way. By default subparser.required attribute is set to False, usage message is not printed and code continues to be executed. oe-pkgdata-util code raises AttributeError exception in this case: AttributeError: 'Namespace' object has no attribute 'func' Fixed this by setting subparser.required to True. [YOCTO #9711] (From OE-Core rev: 207dba5b6eb04c1ae2081bac06724b3b6a198cb3) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-07meta: Drop swabberRichard Purdie
swabber hasn't been used in years and never did work well in the first place. Remove its recipes, class and configuration. (From OE-Core rev: e18657df0b7e45a224fae17e68c447eae94258ac) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-07scripts/lib/bsp/engine.py: Added missing keyword to fix syntax errorHumberto Ibarra
Commit af9f6b88fcc5d7fddff01595f9bcf2aba548720 introduced a syntax error in engine.py by removing keyword "in". This patch adds it back. [Yocto #9719] (From meta-yocto rev: 49f02f3344617f8b077edf61e8f5ead05e8405eb) Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts/pybootchart: Fix print statementRichard Purdie
This was broken with the python3 fixes. (From OE-Core rev: 0eadd008d08f9a6bb17a1f641b4735d0d2012580) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: change python to python3 in shebangEd Bartosh
(From meta-yocto rev: c2629eb1a899a95571ec3649bec7998f130fac00) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: decode subprocess outputEd Bartosh
stdeout and stderr content returned by subprocess API has different types in Python 3(bytes) and Python 2(string). Decoding it to 'utf-8' makes it unicode on both pythons. (From meta-yocto rev: 1de9d0b4ad289c56907d082748cdc0111988cb4f) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03engine: python3: replace iteritems() -> items()Ed Bartosh
Used items() as iteritems() doesn't exist in python 3. (From meta-yocto rev: 0fd2e739cd14c6a02b6f4610176a0ad29b2ecc0e) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: replace exec statement with builtinEd Bartosh
Used exec() builtin instead of 'exec' statement as this statement doesn't exist in python 3. (From meta-yocto rev: ceb6c6fac212c5e1e76bf58b793dc2b9420b4a66) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: use explicit relative importsEd Bartosh
Implicit relative imports within packages are not supported in python 3. They have to be converted to explicit imports. Used 'from .module import' syntax for relative imports. (From meta-yocto rev: 8eb2befc544e29fd87ac1fc75886cc6d7f40ad90) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03engine.py: python3: rename sys.maxint to sys.maxsizeEd Bartosh
Renamed sys.maxint -> sys.maxsize as sys.maxint doesn't exist in python 3. (From meta-yocto rev: b165be8c7f6d44c03bc76dd25c2b9e4cb54bb65a) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: use new metaclass syntaxEd Bartosh
Used metaclass=<metaclass> syntax instead old __metaclass__ = <metaclass> as only new one is supported in python 3. (From meta-yocto rev: 70ba79981d904b4b67440c0b5755b5449cddb025) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: rename raw_input to inputEd Bartosh
Renamed raw_input to input as raw_input does not exist in python 3. (From meta-yocto rev: c9df9f2699885f2ba5b031c8761aefbf3c796067) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03send-error-report: encode data to bytesEd Bartosh
Encoded data before sending it through http as urllib expecting bytes. Fixed TypeError: POST data should be bytes or an iterable of bytes. It cannot be of type str. (From OE-Core rev: b3f4de76d1b32c5079b0b857655cc2baad088519) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03image-live, image-vm, wic: Remove fs size workaroundJussi Kukkonen
Since mtools has been patched to live with filesystems with sizes not divisible by sectors-per-track, we no longer need to try to set the size based on our guess of the sectors-per-track dosfstools is going to use. (From OE-Core rev: 334e32af88b310ff1ed950d127a6dedeb460f8d0) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: change python to python3 in shebangEd Bartosh
(From OE-Core rev: 4b544ff388497cac82b0585f237900595523e1cb) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: decode subprocess outputEd Bartosh
stdeout and stderr content returned by subprocess API has different types in Python 3(bytes) and Python 2(string). Decoding it to 'utf-8' makes it unicode on both pythons. (From OE-Core rev: ae4d36375683b6cfd48af25bfca70b2e77f7ade5) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03combo-layer: python3: use tempfile.TemporaryFileEd Bartosh
Used tempfile.TemporaryFile() API instead of deprecated os.tmpfile(). (From OE-Core rev: bf1b411eb1cd2cc960325d5fdb0cb4f4f7b1e40e) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03dirsize: python3: fix TypeError: unorderable typesEd Bartosh
Python 3 ignores the __cmp__() method and doesn't have cmp() builtin function. This caused sorted() call to raise TypeError: unorderable types: Record() < Record() Removing __cmp__ method and implementing __lt__ should solve the problem as __lt__ is the only method needed for sort[ed] to work. (From OE-Core rev: 391cd33720e7d7e8e261193199272739293ad881) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03combo-layer: python3: import reduceEd Bartosh
Reduce is not a builtin function in python3. It has to be imported from functools. (From OE-Core rev: f9bda8b36decb5a837adcfeb1173092401988801) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: use new metaclass syntaxEd Bartosh
Used metaclass=<metaclass> syntax instead old __metaclass__ = <metaclass> as only new one is supported in python 3. (From OE-Core rev: 067a2156f36a12c731d49f88cf9d0b0bab7a0dcb) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: get rid of __future__ importsEd Bartosh
Removed print_function and with_statement imports from __future__ as they're supported by python 3 by default. (From OE-Core rev: 77ae2daad5d775d710b953cf0c623ce74cb2c274) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: rename raw_input to inputEd Bartosh
Renamed raw_input to input as raw_input does not exist in python 3. (From OE-Core rev: 32765150b860ecdea74b4494b9531f5bc40252bb) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03ksize.py: python3: get rid of strings.joinEd Bartosh
Used join method instead of strings.join as stings.join doesn't exist in python 3. (From OE-Core rev: 10529d8fbc7254523f9749f4b35b07ebcccb6205) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: fix urllib importsEd Bartosh
Some functions and classes have been moved from urllib[2] to urllib.request and urllib.error in python 3. Used new imports to make the code working in python 3. (From OE-Core rev: ec3f1759e8b491a44a1fc1ecb6f89919dd30da97) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: use new style except statementEd Bartosh
Changed old syle except statements 'except <exception>, var' to new style 'except <exception> as var' as old style is not supported in python3. (From OE-Core rev: 438eabc248f272e3d272aecaa4c9cec177b172d5) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-03scripts: python3: convert iterables to listsEd Bartosh
Converted return value of items() keys() and values() to lists when dictionary is modified in the loop and when the result is added to the list. (From OE-Core rev: 874a269eb1d70060c2f3b3f8b70800e2aea789f4) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-02classes/lib: Complete transition to python3Richard Purdie
This patch contains all the other misc pieces of the transition to python3 which didn't make sense to be broken into individual patches. (From OE-Core rev: fcd6b38bab8517d83e1ed48eef1bca9a9a190f57) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-02scripts: use python3 in shebangEd Bartosh
As most of oe-test cases work for devtool and recipetool it makes sense to switch both tools to python 3 by explicitly referring to python3 in their shebangs. (From OE-Core rev: dad9617809c60ec5f11d4780b0afa1cffa1efed5) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-02scripts: Fix urlparse imports for python3Ed Bartosh
Used urllib.parse instead of urlparse to make code working in python 3. (From OE-Core rev: 0a064f2216895db0181ee033a785328e704ddc0b) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-02scripts: Rename ConfigParser -> configparser for python3Ed Bartosh
The ConfigParser API was renamed to configparser in python 3. Renamed ConfigParser -> configparser in scripts/ to make the code working in python 3. (From OE-Core rev: de6e98f272e623ce72e724e66920eecf10cb2d41) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-02scripts: Fix encoding errors for python3Ed Bartosh
Moved call of decode('utf-8') as close as possible to call of subprocess API to avoid calling it in a lot of other places. Decoded binary data to utf-8 where appropriate to fix devtool and recipetool tests in python 3 environment. (From OE-Core rev: 30d02e2aa2d42fdf76271234b2dc9f37bc46b250) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-02scripts: Replace basestring -> str for python3Ed Bartosh
Python 3 doesn't have basestring type as all string are unicode strings. (From OE-Core rev: e8cfab060f4ff3c4c16387871354d407910e87aa) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-06-02scripts: Fix deprecated dict methods for python3Ed Bartosh
Replaced iteritems -> items, itervalues -> values, iterkeys -> keys or 'in' (From OE-Core rev: 25d4d8274bac696a484f83d7f3ada778cf95f4d0) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>