summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bitbake: gitsm.py: revise unpackMark Hatle2019-03-241-38/+78
| | | | | | | | | | | | | | | | | | | | | Greatly simply the unpack rule by copying the general functionality of update_submodules as unpack_submodules. This will recursively construct a set of urls and unpack them using the standard system behaviors. The overall code may be slightly bigger, but this ensures that all of the standard locks are inplace, ensuring the code doesn't change out from under the unpack function. (This could have happened before due to using 'cp' instead of further unpacks on submodules. This may still happen in shallow clones.) (Bitbake rev: 02ce6783bd3cfc117c77ca0380a87b0e1c60d8db) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7d7ee630f1c65e7dd234f945edf5e3b3bcb0fc30) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: gitsm.py: Optimize code and attempt to resolve locking issueMark Hatle2019-03-241-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was reported that a race condition on a shared download directory could occur with the gitsm fetcher, the result happened with a call to git config that occured within the update_submodules. Since the fetch is locked by the upper level, it was probably the prior need_update(...) function causing this because of some old code. The gitsm class inherits the git class. The need_update was overridding the version in gitsm, so that it forceably checked the submodules. It's clear we can optimize the code by only updating if the primary repository needs updating. Since we don't care if the submodule repository has changed because if the primary hasn't, references to the submodule won't change. (Bitbake rev: 4660933f83e528766d71eab662cc79dcf17b4be7) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 346338667edca1f58ace769ad417548da2b8d981) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: tests/fetch.py: Add alternative gitsm test caseMark Hatle2019-03-241-1/+5
| | | | | | | | | | | | | | | In order to test the ssh processing in gitsm, we add an alternative testcase that can be downloaded from git.yoctoproject.org. However, this test case requries (read) access, via ssh, to git.yoctoproject.org. (Bitbake rev: 54802438f2f2d73aba3e7fb8d6cce45aa7cffe77) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c8554cdc1287620fe8e8960561e614567879a010) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: gitsm.py: Add support for alternative URL formats from submodule filesMark Hatle2019-03-241-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | The following appear to be the git supported formats: proto://user:pass@host/path (URI format) user@host:path (SSH format) /path or ./path or ../path (local file format) We adjust the parsing to find out if we have a URI format or not. When we are NOT in URI format, we do our best to determine SSH or file format by looking for a ':' in the overall string. If we find a ':' we assume SSH format and adjust accordingly. Note, in SSH format we simply replace the ':' with a '/' when constructing the URL. However, if the original path was ":/...", we don't want '//' so we deal with this corner case as well. (Bitbake rev: a21b2598531d52123933a0ac1c4deeecfdd1697d) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit dcac05e7dc6b0c5f8e63d36ad105b7eab41f0016) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: gitsm.py: Fix when a submodule is defined, but not initializedMark Hatle2019-03-241-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | It is possible for a submodule to be defined in the .gitmodules file, but never initialized in the repository itself. This shows itself when searching for the defined module hash you will get back a empty value. Similarly we need to identify and skip defined but not initialized submodules during the unpack stages as well. Thanks to raphael.lisicki@siemens.com for their help is figuring out how to resolve this issue. Additionally a problem was found where, while unlikely, it may be possible for the wrong revision to have been searched using ls-tree. This has been resolved in the update_submodules function by keeping the correct revision along with the submodule path. (Bitbake rev: e9c965bd816c8e4e5cc8e45db8e0dab597ce5a6f) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 49e1ff920143dcd4e7f73933d7ab8a84b8ffa1a3) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ref-manual: Fixed SRC_URI cut-and-paste error.Filip Jareš2019-03-191-1/+1
| | | | | | | | | | | | The update fixes a copy-paste-and-forget-to-update-everything error in the documentation of the `SRC_URI` entry in the Reference Manual. The `maxdate` paragraph just repeated what is there for the neighboring `mindate` paragraph which was incorrect. (From yocto-docs rev: fdf0a0e2e0bd0852208d08e5661a04d25c04feef) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mesa: ship /etc/drirc in mesa-megadriverRoss Burton2019-03-051-4/+2
| | | | | | | | | | | | | Many years not shipping the stub drirc seemed like a good idea, but now it has content and is essential for some applications to run. Following patches in master, ship this file in mesa-megadriver. (From OE-Core rev: fbb688ab3eeca1bbfbaaaaffd8c81fd8052bcc68) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl10: Fix mutliple include assumptions for des.h in opensslconf.hDenys Dmytriyenko2019-03-052-0/+36
| | | | | | | | | | | | | | | | The fix is heavily based on Khem's previous fix for bn.h/BN_LLONG breakage: https://git.openembedded.org/openembedded-core/commit/?id=f787b0bb9b0626ddbf2ac94cb206c76716a3773d (From OE-Core rev: 914e1520bf9c45e14bce9993c9131a2c0702b9c9) (From OE-Core rev: 266e73a99b54f741bdbe5d689933c46b2b4731fd) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Cc: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rng-tools: Fix crazy defaultsHongxu Jia2019-03-051-1/+1
| | | | | | | | | | Since commit [f1dc9ac rng-tools: Fix crazy defaults] fixed init based on sysvinit, this fix rngd.service based on systemd. (From OE-Core rev: b1980460839baa04d10866877cbfe31ca8093ff3) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: cooker: Tweak multiconfig dependency resolutionRichard Purdie2019-02-251-29/+24
| | | | | | | | | | | | | | | | | | | There were a couple of problems with the multiconfig dependency resolution: - the "if mc" condition triggering this code wasn't correct, it needs to be "if more than one multiconfig" configured - after adding providers we need to call add_unresolved again and rebuild mcdeps within the "while new" loop By fixing these issues we allow various other combinations of multiconfig builds to work which previously didn't. [YOCTO #13090] [YOCTO #13130] (Bitbake rev: b59cb2bc63940b9ebd8288de7ca4b1d9e96e026c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: siggen: Fix multiconfig corner caseRichard Purdie2019-02-251-0/+2
| | | | | | | | | | | | | There was already a fix to ignore some multiconfig dependencies but its 'opposite' case wasn't covered. Cover that combination to so as to avoid tracebacks in multiconfig builds. [YOCTO #13090] [YOCTO #13130] (Bitbake rev: 3d4e557a539a8ef4a3b7a1e36fc99b118c01cbf4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: runqueue: Filter out multiconfig dependencies from BB_TASKDEPDATARichard Purdie2019-02-251-0/+19
| | | | | | | | | | | | | | | | | The consumers of BB_TASKDEPDATA in OE metadata can't cope with multiconfig dependencies. The choice is either to start adding code to each of them to filter out multiconfig dependencies, or do this at source. After consideration we've decided to do this at source as doing otherwise is code duplication and error prone and in any case we've looked at, they don't make sense. [YOCTO #13090] [YOCTO #13130] (Bitbake rev: 7f157ea8ecf9ba259bb7e226cfd5f2870b7853a3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: runqueue: Fix dependency loop analysis 'hangs'Richard Purdie2019-02-251-3/+9
| | | | | | | | | | | | | Currently the mechanism for breaking out of the dependnecy loop analysis code is broken and doesn't work leading to bitbake appearing to hang. Add in a custom exception for this purpose and fix the code to exit as intended, fixing the hang and making the dependency loop code usable again. (Bitbake rev: e39dbd72ef44eebae32f9fe3b75a1bf789605558) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libaio: Extend to nativePeter Kjellerstedt2019-02-251-1/+1
| | | | | | | | | | | | | | | | | lvm2 currently requires libaio. So building lvm2-native will result in the following error. ERROR: Required build target 'lvm2-native' has no buildable providers. Missing or unbuildable dependency chain was: ['lvm2-native', 'libaio-native'] Extend libaio to native to fix this issue. (From OE-Core rev: 6c9b23b77e62ed382d44f94849c13c1f831e64a7) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-build-perf-report/gitarchive: Move common useful functions to libraryRichard Purdie2019-02-252-80/+81
| | | | | | | | | | | | | These functions can be reused by the resulttool code so move to the common function library for this purpose. (From OE-Core rev: c66f848938c04e133259c5b6903dc592866ab385) (From OE-Core rev: 4b1bd35030c5502873106782a35c4f5a9446e20c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/oe-git-archive: Separate out functionality to library functionRichard Purdie2019-02-252-160/+179
| | | | | | | | | | | | | | | This turns the core of the script into a library function. Ultimately this will let us call that code with custom 'keywords' rather than relying on the data parsed from bitbake metadata which can't be used when archiving historical results. (From OE-Core rev: 4820ca2b0850e29b04a4fd5659a6e9837d6714d0) (From OE-Core rev: e47c48768a01191ec36b9732288e05c9f5e80d52) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lib/buildstats: Improve error messageRichard Purdie2019-02-251-1/+1
| | | | | | | | | | | | | Just stating the recipe counts are different isn't helpful, showing the differences makes it much easier to understand what changed. (From OE-Core rev: 1d84b782e3af6f0e6922d72895c905877cc33739) (From OE-Core rev: 047fd7cf6fc2a3d5d170241f5cc5b61b8d9d8522) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: Make QB_MEM easier to setRobert Yang2019-02-251-0/+11
| | | | | | | | | | | | | | | | | | | | It only could be set as the following in the past: QB_MEM = "-m 256" Now it also can be set as: QB_MEM = "-m 256M (or m)" QB_MEM = "256M (or m)" [YOCTO #11522] (From OE-Core rev: ad246f5ce0652bd917d85884176baa746e1379ff) (From OE-Core rev: ed10ef4f8deaec739ce3713b6ce3b63e134a8c4a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: Let qemuparams override default settingsRobert Yang2019-02-251-2/+11
| | | | | | | | | | | | | | | | | | | | | | Fixed: In meta/conf/machine/include/qemuboot-x86.inc: QB_CPU_x86-64 = "-cpu core2duo" $ runqemu qemux86-64 qemuparams="-cpu coreduo" Check /proc/cpuinfo, it should use coreduo rather than core2duo since user specifies it, but it doesn't, append qemuparams to the last can fix the problem. [YOCTO #11773] (From OE-Core rev: a847dd7202a2c493788c45d11eb86866264af7a4) (From OE-Core rev: 81ab6332bee0426201626cc8a0339ce3e6b81d6f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic/engine: Fix missing parted autobuilder failuresRichard Purdie2019-02-251-3/+5
| | | | | | | | | | | | | | | | OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842 broke the ability to find parted as it may be in sbin which is not in PATH for some users on some distros. Iterate on the original patch to fix this and also fix the original problem. (From OE-Core rev: af3803e5189d7814f9dbd238fb6dab200f351e1a) (From OE-Core rev: 6e2bf8691ffd6004cb40e71a2d1d002b5ed5808f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic/engine.py: Load paths from PATH environment variableWilliam Bourque2019-02-251-2/+7
| | | | | | | | | | | | | | | | | Load self.paths from environment variable and if it fails, fall back to hardcoded list. This is required for users that would need to load different e2fsprogs binaries if their system's ones are not recent enought (From OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842) (From OE-Core rev: 319ee1bb146b91f78d7a141def2b1cf92cf88887) Signed-off-by: William Bourque <wbourque@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/lib/wic/engine: Fix cp's target path for ext* filesystemsLeonardo Augusto2019-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python subprocess' shell=True defaults to /bin/sh[1][2], which often refers to a POSIX-compliant shell. As the -e flag is not defined in the POSIX standard[3], some shells may interpret "-e" as the first argument to the echo command, causing the rest of the command line to fail. In this particular case, "echo -e 'cd {}'" is interpreted as "-e cd {}", which causes the first line of the command to fail, and causing cp to always place the source file in the filesystem's root. Replacing "echo -e" for a printf command makes this more portable. This issue only affects "wic cp" for ext* filesystems. [1] https://docs.python.org/2/library/subprocess.html [2] https://docs.python.org/3/library/subprocess.html [3] http://pubs.opengroup.org/onlinepubs/9699919799 (From OE-Core rev: 9a5b703d4e60c3ccdf80b5289b8e6fc91133fcde) (From OE-Core rev: bf51d6da725a3d5850c3cbd70fb91b91c08e507f) Signed-off-by: Leonardo Augusto <leobsd@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* checklayer: Avoid adding the layer if it is already presentRobert Yang2019-02-252-22/+20
| | | | | | | | | | | | | | | | | | * Rename add_layer() to add_layers() so that add_layer_dependencies() can re-use it. * Avoid adding the layer if it is already present [YOCTO #13148] (From OE-Core rev: b9cc18d83f55ff48c3d6e60c56359f6736d5a06a) (From OE-Core rev: 64310d9d18bb1751595c197e6955774ad5514844) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* checklayer: generate locked-sigs.inc under builddirChangqing Li2019-02-251-3/+3
| | | | | | | | | | | | | | | | | | | yocto-check-layer will find locked-sigs.inc under builddir, but locked-sigs.inc is generated under current bitbake working dir. if run yocto-check-layer outside builddir, we will met error like "No such file or directory: *locked-sigs.inc". change to run bitbake -S under builddir to fix this problem. [YOCTO #12973] (From OE-Core rev: 2ec0bc0b038bc6413978c8f34ef5c0d22b4bc3e7) (From OE-Core rev: f236d8782958df953ca1e2a6f09779cbc8f2d600) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-check-layer-wrapper: Fix path for oe-init-build-envRobert Yang2019-02-251-1/+3
| | | | | | | | | | | | | | | | We only could run it in top of oe-core dir since it assumed oe-init-build-env was in cwd, this patch fixes the problem. [YOCTO #13148] (From OE-Core rev: 47d7b5fcad127171243cc95c586c2c7f35cfac3b) (From OE-Core rev: 09e4b9bead32f143f4a685794c4709fe41bf014d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-build-perf-report: Fix missing buildstats comparisionsRichard Purdie2019-02-251-2/+2
| | | | | | | | | | | | | Integers were being compared to strings leading to missing buildstats comparision data. Fix this. (From OE-Core rev: 2dbbf598192ae2b3aa488df042f56aa6c6634a00) (From OE-Core rev: 9ee8845a583a3fa9e9b07d1b0301201ae56c6c41) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-build-perf-report: Improve branch comparision handlingRichard Purdie2019-02-251-8/+23
| | | | | | | | | | | | | | | | | | | | | When comparing branches, correctly filter the revisions corresponding to the specific branch specified. Also use the commit numbers as a way to gauge spatially related commits for comparision meaning comparisions for out of order build revisions becomes meaninful. This should improve the reporting for autobuilder generated builds. Also improve the branch option help text. (From OE-Core rev: 9f6f4ab6eec9dca07af7f53da5f737a6167bfb38) (From OE-Core rev: 111ee3499308bcde54268d58bf6163a98a9733db) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-build-perf-report: Allow commits from different branchesRichard Purdie2019-02-251-0/+5
| | | | | | | | | | | | | | | | | The code won't currently allow comparisions of two commits on different branches even if the commits are specified by their hashes. This updates the code to search two branches for any relavent commits, hence allowing comparisions to be made. A particularly useful case is master vs. master-next for example. (From OE-Core rev: 2d835bb1570c515ae501442f3ce19fae8e249b27) (From OE-Core rev: c4263bf021daafd4e89acd4cba48c9a7fbd0d8a1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-build-perf-report: Allow branch without hostnameRichard Purdie2019-02-251-2/+2
| | | | | | | | | | | | | | Allow the branch to be set without the hostname option. Previously if hostname wasn't set, branch would be overwritten regardless of whether it was set or not. (From OE-Core rev: 3ec43bf4c6c8f7730a67f63ad4e14903f289014e) (From OE-Core rev: b162c70dd6e926e1700553e27b41eb1c12ee2dce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib_header_wrapper.h: Use #pragma onceKhem Raj2019-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid infinite include loops, especially with bits/wordsize.h which is now possible with the synthesized headers since we now also synthesize bits/wordsize.h itelf for some arches e.g. arm/aarch64 In cases where extra preprocessing tools are used such as clang-tidy e.g. and these tools are not passed the knowledge about architecture then case comes where we enter into header include loop for bits/wordsize.h, since this template does explicitly include bits/wordsize.h To fix this emits the pragma once at beginning of file, this is better solution than include guards, and pragma once is practically supported on all compilers except few e.g. cray c/c++ compiler (From OE-Core rev: 6ab11ac25bb987642d5ca1a07f4bd5f30c66c9c5) (From OE-Core rev: 8f00480fe826ebaff2b78796d757b9e2734f2deb) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* send-error-report: Use https instead of http protocolKhem Raj2019-02-251-3/+3
| | | | | | | | | | | | | errors.yp.org can understand https (From OE-Core rev: f540fed0aec24e28eff8522fddbe3cf7ee45e30b) (From OE-Core rev: 857ebd7fac590f569bff7e8ca29b6ae22eaaa65a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-git-proxy: Avoid resolving NO_PROXY against local filesJan Kiszka2019-02-251-2/+2
| | | | | | | | | | | | | | | NO_PROXY may contain * elements, and if we are unlucky (or want to match all hosts with *), we will pick up local files rather than doing the match in match_host. Quoting helps here. (From OE-Core rev: 7e216e806ca765152fd874e24785f783a3201284) (From OE-Core rev: 5b5c8ccaba188530ae4b05fd49804aaa74cbb949) Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: improve git repo checks before check_commits logicDan Dedrick2019-02-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check_commits logic assumes that both devtool-base and args.branch exist in the git repo that it is operating on. In order to prevent errors at that point it's best to first ensure that both of these refs actually exist. If they don't both exist then the check_commits logic should just be skipped, as it would be if the repo wasn't originally checked out by devtool. Previously if a user removed the args.branch branch from their devtool cloned repo this code would crash on adding the repo with -n. The crash would look like this: Traceback (most recent call last): File "/home/ddedrick/src/poky/scripts/devtool", line 344, in <module> ret = main() File "/home/ddedrick/src/poky/scripts/devtool", line 331, in main ret = args.func(args, config, basepath, workspace) File "/home/ddedrick/src/poky/scripts/lib/devtool/standard.py", line 812, in modify (stdout, _) = bb.process.run('git log devtool-base..%s' % branch, cwd=srctree) File "/home/ddedrick/src/poky/bitbake/lib/bb/process.py", line 178, in run raise ExecutionError(cmd, pipe.returncode, stdout, stderr) bb.process.ExecutionError: Execution of 'git log devtool-base..devtool' failed with exit code 128: fatal: ambiguous argument 'devtool-base..devtool': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' (From OE-Core rev: f13a3490fdb404bbd4c77e45b83540d6deec1358) (From OE-Core rev: ebd3c5e1534ba4ac2a6e97725f8d8650d4aa52a0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: remove duplicate overridesDan Dedrick2019-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEVTOOL_EXTRA_OVERRIDES only needs one entry for each instance of overrides. Previous to these changes it would find every override to SRC_URI and add it to the list. This would duplicate instances where SRC_URI is modified multiple times with the same override like: SRC_URI_append_foo += "file://0001-foo.patch" SRC_URI_append_foo += "file://0002-bar.patch" A bbappend might also overwrite a SRC_URI override, which would also cause multiple instances to occur. When there are multiple instances of the same override in DEVTOOL_EXTRA_OVERRIDES it causes devtool modify to fail when creating override branches. The failure occurs when attempting to create the same override branch a second time and looks like this: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_python_func() autogenerated', lineno: 2, function: <module> 0001: *** 0002:devtool_post_patch(d) 0003: File: '/build/poky/meta/classes/devtool-source.bbclass', lineno: 202, function: devtool_post_patch 0198: 0199: for override in extra_override_list: 0200: localdata = bb.data.createCopy(d) 0201: if override in default_overrides: *** 0202: bb.process.run('git branch devtool-override-%s %s' % (override, devbranch), cwd=srcsubdir) 0203: else: 0204: # Reset back to the initial commit on a new branch 0205: bb.process.run('git checkout %s -b devtool-override-%s' % (initial_rev, override), cwd=srcsubdir) 0206: # Run do_patch function with the override applied File: '/build/poky/bitbake/lib/bb/process.py', lineno: 178, function: run 0174: if not stderr is None: 0175: stderr = stderr.decode("utf-8") 0176: 0177: if pipe.returncode != 0: *** 0178: raise ExecutionError(cmd, pipe.returncode, stdout, stderr) 0179: return stdout, stderr Exception: bb.process.ExecutionError: Execution of 'git branch devtool-override-foo devtool' failed with exit code 128: fatal: A branch named 'devtool-override-foo' already exists. (From OE-Core rev: 90f667db2219f04e6d61588cd61056d3d8da6d7d) (From OE-Core rev: 162be3d43f1d48a22b3aed32cc2f593355e5bf81) Signed-off-by: Dan Dedrick <ddedrick@lexmark.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/contrib/build-perf-test.sh: Remove itRichard Purdie2019-02-251-400/+0
| | | | | | | | | | | | | This is the older script which the code in lib/oeqa/buildperf replaces so delete the obsolete script to avoid confusion. (From OE-Core rev: 9908b7955e75e10d6a1384e4c08417ef534464af) (From OE-Core rev: 9dd395357d32286b5f81673920638316cf01f883) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/contrib/build-perf-test-wrapper.sh: Improve interaction with ↵Richard Purdie2019-02-251-5/+32
| | | | | | | | | | | | | | | | | | | | | | | autobuilder automation This tweaks the script to: * Ensure directories exist and can be written to * Allow the downloads directory to be specified * Error early if the phantomjs or optipng dependencies are not installed * Allow the location of the globalres.log file to be specified This means that the main build directory can be destroyed and any state from the script is stored elsewhere allowing it to be triggered automatically from the autobuilder infrastructure. (From OE-Core rev: 1de5fbd484e6a747ae6419ccc89d8c2911b9706b) (From OE-Core rev: d6f00d9d89f62e60eaa87abf89477ed7865e2859) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl10: Fix mutliple include assumptions for bn.h in opensslconf.hKhem Raj2019-02-252-0/+34
| | | | | | | | | | | | | | | | After adding #pragma once to wrapper header ( opensslconf.h ) this latent issue got to bite us, where it expect bn.h to be including openssl.h to define BN_* defines, which is fragile. This patch removes the contraints for nested includes for bn.h (From OE-Core rev: f787b0bb9b0626ddbf2ac94cb206c76716a3773d) (From OE-Core rev: 19d5bffafb17ea0d5e8060716205cab6ab64f302) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl10: update to 1.0.2qAlexander Kanavin2019-02-252-36/+2
| | | | | | | | | | | (From OE-Core rev: 03149ca307282c22dd9ceb6fe3224bf586b03f6d) (From OE-Core rev: 572865e0d0a61e2096083edc622366e4ac9a8ad0) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl: fix multilib file install conflictsXulin Sun2019-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | To avoid issue like below if run "bitbake lib32-core-image-minimal" with series userspace packages(LAMP,krb5...) added. Add multilib_script support for openssl's c_rehash which is a perl script. Error: Transaction check error: file /usr/bin/c_rehash conflicts between attempted installs of lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-r0.aarch64 (From OE-Core rev: a4032f3cc5de451f0e97eca1f0cbe4a310e1560b) (From OE-Core rev: eb875a7ecb74a9a63d81c64ec770ec65ed5d0211) Signed-off-by: Xulin Sun <xulin.sun@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* iw: fix parsing of WEP keysLiu Haitao2019-02-252-0/+195
| | | | | | | | | | | | | | | The current iw4.14 has a fatal bug that could casue a Segmentation fault when parsing WEP keys. The issue has been fixed by upstream. [https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git/commit/?id=0e39f109c4b8155697a12ef090b59cdb304c8c44] (From OE-Core rev: 6de9eb72f679dd8d8e4de972b1da978522cff8b4) (From OE-Core rev: fcc56a2e2689a1574b9b928f8cd53e28721e4b9f) Signed-off-by: Liu Haitao <haitao.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bluez5: Fix a race issue for toolsRobert Yang2019-02-252-0/+33
| | | | | | | | | | | | | | | | Fixed: cp ../bluez-5.50/tools/hid2hci.rules tools/97-hid2hci.rules cp: cannot create regular file tools/97-hid2hci.rules: No such file or directory make[1]: *** [tools/97-hid2hci.rules] Error 1 (From OE-Core rev: 5cb2b165cf89a307531e199248bc98fb51541521) (From OE-Core rev: be0c94a40972618433c85fc097ede255f95e6c1d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl: Skip assembler optimized code for powerpc64 with muslSerhey Popovych2019-02-252-0/+2
| | | | | | | | | | | | | | This code is written for elfv1 ABI in mind and linked as such: disable all optimizations at the moment when building for powerpc64 with musl. (From OE-Core rev: bee9e807430178426b2a5635b573ae285e889c39) (From OE-Core rev: f2513232d9adb6ec9cf6de06d577aeb6e34b69e0) Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* avahi: avoid depending on skipped packageJens Rehsack2019-02-251-1/+2
| | | | | | | | | | | | | | | | | | When built without D-Bus, libavahi-client is not build: Building libavahi-client: no (You need avahi-daemon and D-Bus!) which causes avahi-dev RDEPENDS failing when creating an image containing development-tools: * - nothing provides libavahi-client = 0.7-r0 needed by avahi-dev-0.7-r0.cortexa8hf-neon (From OE-Core rev: 319532792435be73e96c8319e90336e1298ac2a1) (From OE-Core rev: 0e65ddb5873c6d32ae3c8e86b269ada730cf6e9c) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl: Strip perl version from installed ptest configdata.pm fileDouglas Royds2019-02-251-0/+1
| | | | | | | | | | | (From OE-Core rev: fab0f5162b930f87798be61359a5c287fb13a76c) (From OE-Core rev: d59e340dcd16b2b6a361196f867d9a31a9f36677) Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl ptest: Strip build host paths from configdata.pmDouglas Royds2019-02-251-0/+1
| | | | | | | | | | | | | This file contains CC, CPP, CFLAGS, CXXFLAGS and the like. (From OE-Core rev: c423cd1070045849c3a5b4e2b53043b28e5194f7) (From OE-Core rev: a51c48feffb20a1d53dbcd3c06e3ebb5afc5ace6) Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* keymaps: tighten package write dependencyJonas Bonn2019-02-251-1/+1
| | | | | | | | | | | | | | The dependency on systemd-systemctl-native is only needed if _both_ systemd and sysvinit are in play. (From OE-Core rev: 3ea08f4b24f8a49c3d5039b62b39d6419cfe234c) (From OE-Core rev: a1031ce496f6d8b54169ae9ae0e928032631d5df) Signed-off-by: Jonas Bonn <jonas@norrbonn.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-firmware: Bump to 710963f revisionOtavio Salvador2019-02-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following changes are applied: 710963f Merge https://github.com/ajaykuee/linux-firmware c24aec4 nvidia: add TU10x typec controller firmware 28f5f7d Merge git://git.marvell.com/mwifiex-firmware f30a319 Merge branch 'ath10k-20190201' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/linux-firmware 8fcf0ec bnx2x: Add FW 7.13.11.0. 8bf607c amdgpu: add firmware for vega20 from 18.50 578aee3 amdgpu: bump year on license bd72387 linux-firmware: update Marvell PCIe-USB8997 firmware image 6cfdd52 linux-firmware: update Marvell SD8897-B0 firmware image 2206320 linux-firmware: add Marvell SD8977 firmware image 6b5e23a ath10k: QCA9984 hw1.0: update firmware-5.bin to 10.4-3.9.0.2-00021 0eef77d ath10k: QCA988X hw2.0: update firmware-5.bin to 10.2.4-1.0-00043 1bd5312 ath10k: QCA9888 hw2.0: update firmware-5.bin to 10.4-3.9.0.2-00024 97b1f93 ath10k: QCA6174 hw3.0: update board-2.bin a8b75ca Merge tag 'add-rpi-fw' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux-firmware 56483ad brcm: Add BCM43455 NVRAM for Raspberry Pi 3 B+ 638a91a brcm: Fix filename for BCM43430 NVRAM for the Raspberry Pi 3 Model B bc65650 amdgpu: add raven2 fw for 18.50 release 32201bb amdgpu: add picasso fw for 18.50 release b1eae29 Revert "brcm: Add BCM43455 NVRAM for Raspberry Pi 3 B+" 89d37c6 linux-firmware: Update firmware file for Intel Bluetooth,8265 f089658 linux-firmware: Update firmware patch for Intel Bluetooth 8260 ae90c3b linux-firmware: Update firmware file for Intel Bluetooth,9260 9723ba4 linux-firmware: Update firmware file for Intel Bluetooth,9560 c7148ed Merge tag 'add-rpi-fw' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux-firmware 128441e Merge tag 'iwlwifi-fw-2018-12-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware 56cbf41 Merge git://git.marvell.com/mwifiex-firmware 930f276 brcm: Add BCM43430 NVRAM for the Raspberry Pi 3 Model B fca5958 brcm: Add BCM43455 NVRAM for Raspberry Pi 3 B+ 63ca64a linux-firmware: update Marvell USB8801 B0 firmware image b727739 iwlwifi: update firmwares for 9000 series 80dee31 cxgb4: update firmware to revision 1.22.9.0 0f22c85 Revert "amdgpu: update vega10 fw for 18.50 release" 117d211 brcm: Add 4330 NVRAM for the Prowise PT301 tablet 912d6a5 brcm: Add 43430 NVRAM for the Chuwi Vi8 Plus tablet f16cf5e brcm: Add 43340 based AP6234 NVRAM for the Meegopad T08 HDMI stick 5a2766c brcm: Add 43430a0 based AP6212 NVRAM for the Jumper EZpad mini 3 tablet 867ac13 brcm: Add 43430a0 based AP6212 NVRAM for the Onda V80 Plus tablet a5662fb brcm: Add 4356 based AP6356 NVRAM for the GPD win handheld f055ceb brcm: Add brcmfmac43362-sdio.lemaker,bananapro.txt symlink d9430ac brcm: Add 43362 based AP6210 NVRAM for the Cubietech Cubietruck eb34562 WHENCE: Put quotes around brcmfmac NVRAM filenames be15035 check_whence.py: Add support for filenames with spaces in them e6b9001 rtl_bt: Add firmware and configuration files for the Bluetooth part of RTL8723BS 3de2546 Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware 494709e Merge branch 'BXT_HUC' of git://anongit.freedesktop.org/drm/drm-firmware 8707ef3 iwlwifi: update firmwares for 8000 series 156b549 iwlwifi: add -43.ucode for 9000 series 8a396b6 iwlwifi: update -41.ucode for 9000 series 211de16 brcm: provide new firmwares for BCM4366 chipset 813fa1f Mellanox: Add new mlxsw_spectrum firmware 13.1910.622 a330ddb Merge branch 'for-upstream' of https://github.com/crojewsk/linux-firmware 8de1d88 cavium: Update firmware for CNN55XX crypto driver a7ea5a8 amdgpu: update vega12 fw for 18.50 release ec4b0cd amdgpu: update vega10 fw for 18.50 release 1abe3c3 amdgpu: update raven fw for 18.50 release 6e38fef amdgpu: update polaris11 fw for 18.50 release df89864 amdgpu: update polaris10 fw for 18.50 release a91e850 amdgpu: add firmware for vega12 6cca138 amdgpu: Add new polaris MC firmwares e8404a6 amdgpu: Add new polaris SMC firmwares 8aa9e3e linux-firmware: Update AMD cpu microcode f3f6ada Merge branch 'MSCC-PHYs' of https://github.com/QSchulz/linux-firmware 4bbd950 Merge branch 'for-upstream' of git://git.chelsio.net/pub/git/linux-firmware d9fb2ee nfp: update Agilio SmartNIC flower firmware to rev AOTC-2.10.A.13 57d49d5 microchip: add firmware for VSC8574 and VSC8584 Ethernet PHYs 82f6dbf linux-firmware: intel: Update Cannonlake audio firmware. 69f153b firmware/huc/bxt: Add huC Update for BXT 5904eab nfp: update Agilio SmartNIC firmware to rev 2.1.16 e7cdec4 cxgb4: update firmware to revision 1.21.5.0 License-Update: - LICENSE.amdgpu: Copyright year update; - WHENCE: New firmware files additions and version updates; (From OE-Core rev: 4e6d242eb9678430df387c0c106d305df6d2e71b) (From OE-Core rev: c6b514f0f729a5ee2f97d54dbe142de8d0bf1900) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-firmware: split out liquidio firmwareRoss Burton2019-02-251-0/+3
| | | | | | | | | | | | | | Part of this firmware is a pre-built Linux kernel, so it's both huge (25MB) and triggers binary security scanners as the kernel is 3.10.87. (From OE-Core rev: 973befb880094c1d862291be0bdfa74ccdfa0929) (From OE-Core rev: b2885302dfb4b25ff1faf1906c06ba290c644be8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-firmware: recommend split up packagesRoss Burton2019-02-251-3/+3
| | | | | | | | | | | (From OE-Core rev: 54cd9bd1b7d089169e6d6fe73a77930d736f46f0) (From OE-Core rev: 463a99a08866936fbbd4178bfe5b6679d6d103fa) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto/4.18: update to v4.18.27Bruce Ashfield2019-02-253-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrating the -stable updates from Paul Gortmaker that comprise the following commits: fb957805a800 Linux 4.18.27 e40e99b6b15d ipmi:ssif: Fix handling of multi-part return messages ec5b2f3f897b ipmi: Prevent use-after-free in deliver_response d605dfec5314 ipmi: msghandler: Fix potential Spectre v1 vulnerabilities 6fcd5c67bbed ipmi: fix use-after-free of user->release_barrier.rda 8978d7c6dec4 Bluetooth: Fix unnecessary error message for HCI request completion 9aa6a6afdc9d iwlwifi: mvm: Send LQ command as async when necessary be293e2c8d5d mm, proc: be more verbose about unstable VMA flags in /proc/<pid>/smaps 5da1802b5dd9 userfaultfd: clear flag if remap event not enabled 08861c6db0c1 mm/swap: use nr_node_ids for avail_lists in swap_info_struct fbd6851e6d57 mm/page-writeback.c: don't break integrity writeback on ->writepage() error 42af1b118dec ocfs2: fix panic due to unrecovered local alloc e701c6b47b1e scsi: megaraid: fix out-of-bound array accesses c2414688a11f scsi: smartpqi: call pqi_free_interrupts() in pqi_shutdown() 248849ffcee8 ath10k: fix peer stats null pointer dereference e6e7a27d9894 scsi: smartpqi: correct lun reset issues f82c77b69dd4 scsi: mpt3sas: fix memory ordering on 64bit writes 7fe3902a1b30 IB/usnic: Fix potential deadlock 07716336ae4f sysfs: Disable lockdep for driver bind/unbind files 52223b291461 ALSA: bebob: fix model-id of unit for Apogee Ensemble f55b7d8c5747 dm: Check for device sector overflow if CONFIG_LBDAF is not set 744fb8e55bdc clocksource/drivers/integrator-ap: Add missing of_node_put() c7e5ef0fad26 quota: Lock s_umount in exclusive mode for Q_XQUOTA{ON,OFF} quotactls. 051f86c6e4fe perf tools: Add missing open_memstream() prototype for systems lacking it f40cb62ae378 perf tools: Add missing sigqueue() prototype for systems lacking it fe10d3ee10ae dm snapshot: Fix excessive memory usage and workqueue stalls dbb2e01442dd tools lib subcmd: Don't add the kernel sources to the include path 9844e0dbc6d0 perf stat: Avoid segfaults caused by negated options d8dc75d3d9fc dm kcopyd: Fix bug causing workqueue stalls dff3fa1af70f dm crypt: use u64 instead of sector_t to store iv_offset 26dfea580c42 x86/topology: Use total_cpus for max logical packages calculation 5f13f97aad1e netfilter: ipt_CLUSTERIP: fix deadlock in netns exit routine d5e112ef684d netfilter: ipt_CLUSTERIP: remove wrong WARN_ON_ONCE in netns exit routine ed843e0c755b netfilter: ipt_CLUSTERIP: check MAC address when duplicate config is set ab68568470d6 perf vendor events intel: Fix Load_Miss_Real_Latency on SKL/SKX 5ddf63d48c16 perf parse-events: Fix unchecked usage of strncpy() 882079829dfb perf svghelper: Fix unchecked usage of strncpy() e689fb5da3fc perf tests ARM: Disable breakpoint tests 32-bit ef3ae9b3e540 perf intel-pt: Fix error with config term "pt=0" 8639a6aacfd7 tty/serial: do not free trasnmit buffer page under port lock 80c3cdea380c btrfs: improve error handling of btrfs_add_link 2202b846b13c btrfs: alloc_chunk: fix more DUP stripe size handling ab3a0bbe8b0b mmc: atmel-mci: do not assume idle after atmci_request_end 32f972da3d3a kconfig: fix memory leak when EOF is encountered in quotation 10d9a6a992ee kconfig: fix file name and line number of warn_ignored_character() f7bcc8b2f7ef bpf: relax verifier restriction on BPF_MOV | BPF_ALU eec0856907da arm64: Fix minor issues with the dcache_by_line_op macro f2300824da71 clk: imx6q: reset exclusive gates on init 1604baf07d22 arm64: kasan: Increase stack size for KASAN_EXTRA 13ba93449b46 selftests: do not macro-expand failed assertion expressions 3bbd076d9136 scsi: target: use consistent left-aligned ASCII INQUIRY data e37db031ef5a net: call sk_dst_reset when set SO_DONTROUTE fb614921bc34 media: venus: core: Set dma maximum segment size eb2c9c4ca615 ASoC: use dma_ops of parent device for acp_audio_dma 68a03c142063 media: firewire: Fix app_info parameter type in avc_ca{,_app}_info b60c7a6713d5 powerpc/pseries/cpuidle: Fix preempt warning df30a1b5d8d2 powerpc/xmon: Fix invocation inside lock region 4f03e69412ba media: uvcvideo: Refactor teardown of uvc on USB disconnect e6b355ae24ba pstore/ram: Do not treat empty buffers as valid 72d479d16ec9 clk: imx: make mux parent strings const 277364cbbd21 jffs2: Fix use of uninitialized delayed_work, lockdep breakage d206a38109fc efi/libstub: Disable some warnings for x86{,_64} 643a876a5b01 rxe: IB_WR_REG_MR does not capture MR's iova field f5d7d77be0a6 scsi: qedi: Check for session online before getting iSCSI TLV data. 5c28f6e86aff ASoC: pcm3168a: Don't disable pcm3168a when CONFIG_PM defined 6ca660928969 selinux: always allow mounting submounts 128146d4fb71 fpga: altera-cvp: fix probing for multiple FPGAs on the bus 3e60aeeefaeb usb: gadget: udc: renesas_usb3: add a safety connection way for forced_b_device e1c8feafd5fe samples: bpf: fix: error handling regarding kprobe_events 2b3081b77e3f clk: meson: meson8b: fix incorrect divider mapping in cpu_scale_table 0bf0163094a9 drm/atomic-helper: Complete fake_commit->flip_done potentially earlier 21330a217643 arm64: perf: set suppress_bind_attrs flag to true 066b9fddd721 crypto: ecc - regularize scalar for scalar multiplication e26359f1620c MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur 3afff9e63c8e x86/mce: Fix -Wmissing-prototypes warnings 9b3a195320ca ALSA: oxfw: add support for APOGEE duet FireWire 04aba67bbf94 bpf: Allow narrow loads with offset > 0 f30cc07af44f serial: set suppress_bind_attrs flag only if builtin d264a0f394ba writeback: don't decrement wb->refcnt if !wb->bdi 74691a75e365 of: overlay: add missing of_node_put() after add new node to changeset 419af4cd1015 selftests/bpf: enable (uncomment) all tests in test_libbpf.sh 2e3f88e667c6 e1000e: allow non-monotonic SYSTIM readings f782c9d1da48 platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey 1261977d0ab4 ixgbe: allow IPsec Tx offload in VEPA mode 7c73931b7303 drm/amd/display: Guard against null stream_state in set_crc_source 39d92f35a8dc gpio: pl061: Move irq_chip definition inside struct pl061 3aec221e313a netfilter: ipset: Allow matching on destination MAC address for mac and ipmac sets 6a5be9a2ffef ipv6: Take rcu_read_lock in __inet6_bind for mapped addresses 50d329eca381 r8169: Add support for new Realtek Ethernet d1aad26bb964 qmi_wwan: add MTU default to qmap network interface 62b4f9e777bf net, skbuff: do not prefer skb allocation fails early eb5c8d69ea42 net: dsa: mv88x6xxx: mv88e6390 errata 993bc7d54dac mlxsw: spectrum_switchdev: Set PVID correctly during VLAN deletion 8fb8533a5309 mlxsw: spectrum: Disable lag port TX before removing it 75daf3c475df ipv6: Consider sk_bound_dev_if when binding a socket to a v4 mapped address 73827a8e2e30 nbd: Use set_blocksize() to set device blocksize f65d7d5574e1 drm/fb-helper: Ignore the value of fb_var_screeninfo.pixclock 528fa9207170 loop: drop caches if offset or block_size are changed 3df31feee60d loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl() d4082dc05ac9 loop: Get rid of 'nested' acquisition of loop_ctl_mutex 78f210acfd34 loop: Avoid circular locking dependency between loop_ctl_mutex and bd_mutex 3ebf94b079ba loop: Fix deadlock when calling blkdev_reread_part() fc4a4583f9f1 loop: Move loop_reread_partitions() out of loop_ctl_mutex 2c2c3aa3ab1c loop: Move special partition reread handling in loop_clr_fd() e2c6ee2931ca loop: Push loop_ctl_mutex down to loop_change_fd() b442997a7285 loop: Push loop_ctl_mutex down to loop_set_fd() 33d682700fb0 loop: Push loop_ctl_mutex down to loop_set_status() 49f911a6a4c0 loop: Push loop_ctl_mutex down to loop_get_status() c3be2cd6ad9e loop: Push loop_ctl_mutex down into loop_clr_fd() 9a4a7555c177 loop: Split setting of lo_state from loop_clr_fd d1f05249099a loop: Push lo_ctl_mutex down into individual ioctls 50bbdfab99c1 loop: Get rid of loop_index_mutex bc40dc95afdc loop: Fold __loop_release into loop_release 23d5eac305d0 block/loop: Use global lock for ioctl() operation. e0d29ef2a8b0 block/loop: Don't grab "struct file" for vfs_getattr() operation. 8281310f32aa tipc: fix uninit-value in tipc_nl_compat_doit 95c94c995d8e tipc: fix uninit-value in tipc_nl_compat_name_table_dump b099f94e1e4d tipc: fix uninit-value in tipc_nl_compat_link_set 8e649a4839e0 tipc: fix uninit-value in tipc_nl_compat_bearer_enable e54458ac168e tipc: fix uninit-value in tipc_nl_compat_link_reset_stats 9a8f56b713dc tipc: fix uninit-value in in tipc_conn_rcv_sub 08ea8e1bfd4b sctp: allocate sctp_sockaddr_entry with kzalloc 4c02dbac416c blockdev: Fix livelocks on loop device af7bec66e3ee selinux: fix GPF on invalid policy de9b736152ed block: use rcu_work instead of call_rcu to avoid sleep in softirq b232d75be71a netfilter: ebtables: account ebt_table_info to kmemcg aa4d1d6641b5 sunrpc: handle ENOMEM in rpcb_getport_async ddb29b79dbff media: vb2: be sure to unlock mutex on errors b9f0f2f9cf59 media: vb2: vb2_mmap: move lock up 7308ece86dd0 LSM: Check for NULL cred-security on free 71ba5763243b ipv6: make icmp6_send() robust against null skb->dev 05e6bff7e7a6 bpf: in __bpf_redirect_no_mac pull mac only if present 4181e7d61b1a media: vivid: set min width/height to a value > 0 cbfc610ae5f2 media: vivid: fix error handling of kthread_run 05f5b1394483 omap2fb: Fix stack memory disclosure 28063cb50ed8 fix int_sqrt64() for very large numbers 37112a960b7f Disable MSI also when pcie-octeon.pcie_disable on 8fd61f25fcf3 arm64: dts: marvell: armada-ap806: reserve PSCI area 58c3acda1754 arm64: kaslr: ensure randomized quantities are clean to the PoC 9a013b991c02 pstore/ram: Avoid allocation and leak of platform data 1aa9985076dc RDMA/nldev: Don't expose unsafe global rkey to regular user b409b102c7d8 media: v4l: ioctl: Validate num_planes for debug messages 92dd1f93a3c9 mfd: tps6586x: Handle interrupts on suspend 2e63388cbfdb OF: properties: add missing of_node_put 1957d16bceca drm/i915/gvt: Fix mmap range check f1e756d98a46 MIPS: lantiq: Fix IPI interrupt handling ac8f34885340 mips: fix n32 compat_ipc_parse_version 0830f02f81b3 scsi: sd: Fix cache_type_store() f25d687e3d8b scsi: core: Synchronize request queue PM status only on successful resume 0f7357d9b8e4 Yama: Check for pid death before checking ancestry f94e8c0566d0 btrfs: wait on ordered extents on abort cleanup 4b1129e59323 Revert "btrfs: balance dirty metadata pages in btrfs_finish_ordered_io" f9ac2ffa0255 xen: Fix x86 sched_clock() interface for xen 79ad9eda6689 x86/xen/time: Output xen sched_clock time from 0 7b3718f98f17 crypto: talitos - fix ablkcipher for CONFIG_VMAP_STACK c194e944dc98 crypto: talitos - reorder code in talitos_edesc_alloc() 0b612c90335c crypto: authenc - fix parsing key with misaligned rta_len bed3cec44833 crypto: bcm - convert to use crypto_authenc_extractkeys() f1daff3d1cb1 crypto: ccree - convert to use crypto_authenc_extractkeys() b445d866e2fa crypto: authencesn - Avoid twice completion call in decrypt path 1d5d8babb9a8 crypto: caam - fix zero-length buffer DMA mapping 04836f6b86bd crypto: sm3 - fix undefined shift by >= width of value 42cd579fd790 bonding: update nest level on unlink 12dff858b935 r8169: don't try to read counters if chip is in a PCI power-save state 5087c2825807 smc: move unhash as early as possible in smc_release() cf652d77ac45 tun: publish tfile after it's fully initialized faee48550bf4 tcp: change txhash on SYN-data timeout e87c244b11cd net: bridge: fix a bug on using a neighbour cache entry without checking its state c499692ded84 ipv6: fix kernel-infoleak in ipv6_local_error() a3ab077a3f79 arm64: Don't trap host pointer auth use to EL2 6f127252fe5f arm64/kvm: consistently handle host HCR_EL2 flags e5fed8d49b5b scsi: target: iscsi: cxgbit: fix csk leak f1778e1523fa netfilter: nf_conncount: don't skip eviction when age is negative df00c2c10e4f can: gw: ensure DLC boundaries after CAN frame modification 58e9f5227691 tty: Don't hold ldisc lock in tty_reopen() if ldisc present c6e522371001 tty: Simplify tty->count math in tty_reopen() e3ac534b8aa5 tty: Hold tty_ldisc_lock() during tty_reopen() 3456ecaf8d34 tty/ldsem: Wake up readers after timed out down_write() 2b1afc9c3506 Btrfs: use nofs context when initializing security xattrs to avoid deadlock 403d0f9134a7 Btrfs: fix access to available allocation bits when starting balance 343ae5df68a2 KVM: arm/arm64: Fix VMID alloc race by reverting to lock-less 42e3a4424b12 sunrpc: use-after-free in svc_process_common() 39e372a81d13 mm: page_mapped: don't assume compound page is huge or THP 845f8457893a ext4: track writeback errors using the generic tracking infrastructure a0e9782472b8 ext4: use ext4_write_inode() when fsyncing w/o a journal c60e8096cc4d ext4: avoid kernel warning when writing the superblock to a dead device 3ec6f7792def ext4: fix a potential fiemap/page fault deadlock w/ inline_data 02d823cdb2a4 ext4: make sure enough credits are reserved for dioread_nolock writes 154261392771 rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set 98213a9d5ce0 drm/amdgpu: Don't fail resume process if resuming atomic state fails dc2660871a4a drm/amdgpu: Don't ignore rc from drm_dp_mst_topology_mgr_resume() 26089047b42c drm/amd/display: Fix MST dp_blank REG_WAIT timeout 003d29ca6fba PCI: dwc: Move interrupt acking into the proper callback b90e95417c02 PCI: dwc: Take lock when ACKing an interrupt d51df9e16301 PCI: dwc: Use interrupt masking instead of disabling c122260b25cd drm/amdgpu: Add new VegaM pci id 789040bc5039 vfio/type1: Fix unmap overflow off-by-one 86cecca3d93e i2c: dev: prevent adapter retries and timeout being set as minus value 50558f1ca67b ACPI / PMIC: xpower: Fix TS-pin current-source handling 4b75905144c7 ACPI: power: Skip duplicate power resource references in _PRx c78b2116c9d7 mm, memcg: fix reclaim deadlock with writeback 8bf6869b4d75 mm/usercopy.c: no check page span for stack objects d6c879709135 slab: alien caches must not be initialized if the allocation of the alien cache failed bb1c250d55ff USB: Add USB_QUIRK_DELAY_CTRL_MSG quirk for Corsair K70 RGB 39fa1b192449 USB: storage: add quirk for SMI SM3350 4385b42a4cc2 USB: storage: don't insert sane sense for SPC3+ when bad sense specified d10e7b64e2b3 usb: cdc-acm: send ZLP for Telit 3G Intel based modems af318dc8d1f4 cifs: Fix potential OOB access of lock element array 4c26d3a072da CIFS: Do not hide EINTR after sending network packets 50c6b89008ec CIFS: Fix adjustment of credits for MTU requests a7eb3c3dc214 ALSA: hda/realtek - Disable headset Mic VREF for headset mode of ALC225 dcb78b2a6e1c ALSA: hda/realtek - Add unplug function into unplug state of Headset Mode for ALC225 26b78760c7ae ALSA: hda/realtek - Support Dell headset mode for New AIO platform 94ddf9e27eb5 cpufreq: scmi: Fix frequency invariance in slow path 516c5e5f484f Revert "x86/hyper-v: Check cpumask_to_vpset() return value in hyperv_flush_tlb_others_ex()" (From OE-Core rev: c05bd600a4200a76513ff5a127f44efe1eab4045) (From OE-Core rev: 0e064f8d2a5385fa937a06e230f1ffa650b4a8d9) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>