summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* postinst_intercept: allow to pass variables with spacesMartin Jansa2015-09-181-1/+1
| | | | | | | | | | | | | | | * trying to pass foo="a b" through postinst_intercept ends with the actual script header to containing: b foo=a which fails because "b" command doesn't exist. (From OE-Core master rev: c66d7d85b7225be8c838449324d506565dd0081d) (From OE-Core rev: e1cb77476934ea0f80993df049c3708bfa33dba3) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: fix path parsing, use last occurrenceGeorge McCollister2015-09-181-1/+1
| | | | | | | | | | If the path contains 'scripts' more than once the first occurrence will be incorrectly used. Use rfind instead of find to find the last occurrence. (From OE-Core rev: 35ecb0b8557aae85f377c9d99f1a72cbb76fb6d8) Signed-off-by: George McCollister <george.mccollister@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: Handle device names like tapX@NONERichard Purdie2015-09-181-1/+1
| | | | | | | | | | | | | | | | ip list can return devices in the form tapX@NONE. If it does so, ensure we handle that case correctly. Newer distros appear to do this in some cases. [YOCTO #8129] (From OE-Core master rev: 6459dde380febce24d2c355d441d9cb3b14409b9) (From OE-Core rev: a6709ac54bb9ac79692c3c6faadaace11b8f33f4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Make sure file exists before removing itEd Bartosh2015-08-091-8/+8
| | | | | | | | | | | | | | | | | Bunch of os.remove calls were added to the partition.py lately. They're causing wic to fail with OSError: [Errno 2] No such file or directory if file doesn't exist. Added check for file existence to all recently added calls of os.remove. That should fix this regression. (From OE-Core rev: 75162b05b5ad9aac307f7911caecb2b8a017acbf) (From OE-Core rev: 41f08393643ceb2607cad44d2c485b3dc9da7ec9) 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>
* wic: remove intermediate partitionsAlexandre Belloni2015-08-091-0/+8
| | | | | | | | | | | | | | Remove intermediate partitions that may have been created by a previous wic invocation. Those partitions are causing issues on some systems. In particular vfat partition creation is hanging on mcopy execution on Fedora. (From OE-Core rev: 8d2587d87601a7ff0fad840dabc07d66363b2810) (From OE-Core rev: 8bea23a89968db3d44b9fae2ceb242dfd89a4880) Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lib/devtool/standard: Fix patch cleanupRichard Purdie2015-07-081-1/+2
| | | | | | | | | | | | | | | | | | | | If patches fail to apply with git, quilt it used as a fallback. If that happens, the code in this class is meant to handle cleanup of these patch files. In the case where ${S} is a subdir of the git tree, the code doesn't correctly set the patches directory. This change correctly sets the patches directory (which is different to the location of the git repository). [YOCTO #7911] (From OE-Core master rev: de6e0f3af5e858960676ea291036e59105fd806f) (From OE-Core rev: 03dbc60c165a511894d1ae10ac1d90c1fadcc268) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-internal: set mutual exclusiveness for serial and nographic optionsJagadeesh Krishnanjanappa2015-06-281-4/+5
| | | | | | | | | | | | | | | | | | | | Use "-nographic" option only if "serial" option is not specified. Otherwise we get below error when 'runqemu <kernel_image> <rootfs_image> serial' is executed, (snip) QEMU 2.2.0 monitor - type 'help' for more information (qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple character devices -- CUT -- (From OE-Core rev: 8b0527951ab71c4a4dc4d1238cd9e9e60a6eb5ee) (From OE-Core rev: c3a44794de957b216aaea19da371657194c86fc3) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-script: define console for qemuarm NFS bootingJagadeesh Krishnanjanappa2015-06-281-1/+1
| | | | | | | | | | | | | | Add console=ttyAMA0,115200 as one of the boot parameters for qemuarm, in order to print bootlog messages on the console. (From OE-Core rev: 2d2db8f517ea719f097c957559175a07ecee82ad) (From OE-Core rev: 7113153c50e0d9bb04c6b422be2c75152f3105c9) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-internal: add support to boot arm64 qemu target via NFSJagadeesh Krishnanjanappa2015-06-281-0/+9
| | | | | | | | | | | | | Add required boot parameters inorder to boot arm64 qemu target via NFS (From OE-Core rev: 0b614317b38b933a4845cd006b0ad734adfa559d) (From OE-Core rev: 4311b8f59b2a551f2928a4705d4e85901a39995e) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: fix MACHINE being detected as qemuarm for qemuarm64 kernel imageJagadeesh Krishnanjanappa2015-06-281-2/+2
| | | | | | | | | | | | | | | | Basically, runqemu script autodetects MACHINE type based on the kernel image name; if MACHINE name is not specified. Since 'qemuarm' string is common in both qemuarm amnd qemuarm64 kernel image names, the MACHINE type is considered as 'qemuarm' even when qemuarm64 kernel image name is given in command line. (From OE-Core rev: 388b243668a5c28fb69b760ce9be5adbc85352d8) (From OE-Core rev: eeae1fb7afd30174616cfec6204b4c97c94879ca) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: if workspace layer exists, still ensure it's in bblayers.confPaul Eggleton2015-06-281-14/+22
| | | | | | | | | | | | | | When we run devtool, if the workspace layer already exists but isn't in bblayers.conf (perhaps because it was previously created but subsequently removed from bblayers.conf by the user) then we should add it and notify the user, otherwise devtool operations won't work. (From OE-Core master rev: 313b622a6c6613092ed18a2158e090521344f6c0) (From OE-Core rev: 2904c1130ea7cc1abde0609f1ba1394e0f31a6fa) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: fix build env command execution error handlingPaul Eggleton2015-06-282-7/+24
| | | | | | | | | | | | | | | | | If we execute an external command, we ought to prepare for the possibility that it can fail and handle the failure appropriately. We can especially expect this to happen when running bitbake in this scenario. Ensure we return the appropriate exit code to the calling process. Fixes [YOCTO #7757]. (From OE-Core master rev: 98a716d79bfc5434a5b42d3ca683eab3eea30a41) (From OE-Core rev: 2791fe9236f7173e6b998cf9b40fe238566ed8ee) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipetool: ensure git clone is standalone when extractingPaul Eggleton2015-06-283-6/+15
| | | | | | | | | | | | | | | If -x is specified and the specified URI was a git repository, we need to ensure that the resulting clone is a sandalone and not one that has pointers into the temporary fetch location or DL_DIR (since the git fetcher does a local clone with -s). Split out the code from devtool that already does this for "devtool modify -x" and reuse that. (From OE-Core master rev: fc47e8652ef32e7399f57c80593df90dc52d8b84) (From OE-Core rev: d8f151b6a385f81abead65624ba15d42cbd90e11) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipetool: avoid second-level subdir when extractingPaul Eggleton2015-06-281-6/+7
| | | | | | | | | | | | | | When -x was specified, we were getting the normal unpack subdirectory which we don't really want - if there's only one subdirectory unpacked then we should effectively copy just it to the extraction path, not as a subdirectory under it. (From OE-Core master rev: 0eeecce96a0aa757c2c4c4ac4d82e3bcbf0f982c) (From OE-Core rev: 3378c932570ba2301cd02103225fcf7629de656f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: update-recipe: check if source tree is a git repositoryPaul Eggleton2015-06-281-5/+11
| | | | | | | | | | | | | If you've done "devtool add" (or "devtool modify" without -x) then it's possible that the external source tree is not a git repository, so we should handle that case here instead of printing a traceback. (From OE-Core master rev: eb2147aa8facd4ef33a0749e9ae660ec686dad48) (From OE-Core rev: c5dc3e819c1bb224e3cb667381faa5abf1888362) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: update-recipe: handle unversioned bbappendsPaul Eggleton2015-06-281-7/+7
| | | | | | | | | | | | | | Use the proper bbappend file name, don't just assume it will have a version suffix (because it won't if the original recipe doesn't). Fixes [YOCTO #7651]. (From OE-Core master rev: 3332d68ef7b2a300ce8dcf5021497d98e5b17baa) (From OE-Core rev: 3d5ea16a1f53c12d86c4e8df6af864964541cf02) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: add: use correct bbappend file name with -V optionPaul Eggleton2015-06-281-1/+1
| | | | | | | | | | | | | | | | | We weren't adding the version into the bbappend file name when -V was specified which meant that building or resetting failed. Also adjust one of the tests so that we're testing devtool add both with and without this option. Fixes [YOCTO #7647]. (From OE-Core master rev: bdbeff0cd342e31053d7203d78fc5dda611052b1) (From OE-Core rev: 0b9e8817fc8ba375a1045a66d04b3fd2b498427b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: handle . in recipe namePaul Eggleton2015-06-281-1/+1
| | | | | | | | | | | | | | Names such as glib-2.0 are valid (and used) recipe names, so we need to support them. Fixes [YOCTO #7643]. (From OE-Core master rev: b9fd8d4d4dfae72de2e81e9b14de072e12cecdcf) (From OE-Core rev: 36df1bb9bb3c92d096118b74fdf11a243be3f7d5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: include bbappends in recipe parsingMarkus Lehtonen2015-06-281-13/+22
| | | | | | | | | | | | | In order to get correct metadata, SRCREV for example. Fixes [YOCTO #7648]. (From OE-Core master rev: 8b1794559dd7fd956716179d628e61cffdce1686) (From OE-Core rev: becbd5d50a091fe4a980361d9c99efa01f43edcc) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: modify: implement --no-same-dirMarkus Lehtonen2015-06-281-2/+7
| | | | | | | | | | | | | This option can be used to have a separate build directory, in order to keep the srctree directory clean for packages that do not need to be built in the source directory. (From OE-Core master rev: 5cc348c0a3016e4ccc1e80d099e2e197b3b38bd2) (From OE-Core rev: a7316a4c564901b30af740ece6631a6f68355bb4) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: modify: use B=S if that is the default for the recipeMarkus Lehtonen2015-06-281-5/+12
| | | | | | | | | | | | | | | | | Makes the build succeed for packages which do not support separate build directory, e.g. zlib. The same outcome could be achieved with the --same-dir option, but, it's generally hard to tell if a random package would need that option. The negative side effect of this patch is that dev srctree (of some packages that build fine without this modification) gets dirtied by build artefacts. (From OE-Core master rev: 6ac5692426956e276ba2119f917b0f30791e6cd6) (From OE-Core rev: 97078c56e8b8a235e923d964253775e20112a36f) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: call parse_recipe with correct argumentsMarkus Lehtonen2015-06-281-2/+3
| | | | | | | | | | | | | | Give the correct data object ("config data" instead of "recipe data") as an argument to oe.recipeutils.patch_recipe() Fixes [YOCTO #7595] (From OE-Core master rev: 7d2b918019b0afe215a6489dad697afac34f73e9) (From OE-Core rev: f8427fe565e44e46246146bdaae66a5d83ae8c9d) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/combo-layer: Fix exit codes and tty handlingRichard Purdie2015-06-111-3/+7
| | | | | | | | | | | | | | If combo-layer is called from a non-interactive context we should exit with a correct error code rather than try and drop to a shell. This patch cleans up a few error case exit codes as well as detecting and handling non-interactive usage. (From OE-Core rev: 3b1d89a51445cf526ca84eb5b53de434f9585d6e) (From OE-Core rev: b08ee8478f0cc2e2f9394c7e209dae45de2d845e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: handle unset dest_dir in sanity_check()Patrick Ohly2015-05-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | The previous "clean up dest_dir checking" patch (f8cdbe7497) improved handling of empty dest_dir but made handling of unset dest_dir worse: instead showing the "Option dest_dir is not defined for component ..." error, it fails with a Python exception. Avoid that by providing a sane fallback for the unset case. With that change, dest_dir is no longer strictly required, but the check for it is kept to ensure that a combo-layer.conf also works with older combo-layer versions. [Yocto #7773] (From OE-Core rev: d4bf858b2c15bef128fd6d606b08203a318e2d4c) (From OE-Core rev: b266977372f2d5704d00dd07b29ea49898ebf70e) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: improve merge commit handlingPatrick Ohly2015-05-291-3/+24
| | | | | | | | | | | | | | | | | | | | | | When the head of a branch is a merge commit, combo-layer did not record that commit as last_revision because it only considers applied patches, and the merge commit never gets applied. This causes problems when the merge commit leads to multiple patches and the commit id that gets recorded only reaches some of these patches. The next run then will try to re-apply the other patches. This special case is now detected and dealt with by bumping last_revision to the branch commit. The behavior where the head is a normal commit is intentionally not changed, because some users might prefer the traditional behavior. (From OE-Core rev: 701bcd52c208f22a9a6c48a11a35bcf1c4e413df) (From OE-Core rev: 1bc46199e569411150b050818ff17abc66f899f2) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mkefidisk.sh: fix hanging on non-writeable devicePaul Eggleton2015-05-151-0/+3
| | | | | | | | | | | | | | If cleanup() is called early on, as happens when the device isn't writeable, then none of the mount point variables are set; thus the script was calling grep with only one argument and appeared to hang since it was waiting for input on stdin. (From OE-Core master rev: cf4a18eec2a65d840352d1a2862242d116e8a409) (From OE-Core rev: f8b8fbeee3f5c51f6b3e39200f935156be3936f3) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mkefidisk.sh: use script mode when running partedPaul Eggleton2015-05-151-9/+9
| | | | | | | | | | | | This avoids parted showing prompts and thus effectively hanging the script in in the case of initially malformed disks. (From OE-Core master rev: 8f6eb9a86ce64b4c534342fe315069eb4064de88) (From OE-Core rev: 8e72fd01071694b73ec092657f5378dbadd4f396) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: force use of bash when running build within extensible SDKPaul Eggleton2015-05-151-0/+5
| | | | | | | | | | | | | | | | | | | | | Ubuntu's default dash shell causes oe-init-build-env to behave a bit differently - (a) it can't pick up the OE root directory and (b) it can't see any build directory specified as a command-line argument (since dash doesn't pass through any arguments specified to sourced scripts). We could work around these but doing so requires some internal knowledge of the script; a much simpler fix is just to force running the command under bash since it's expected to be installed on every distro. Thanks to Chen Qi <Qi.Chen@windriver.com> for this fix. Fixes [YOCTO #7614]. (From OE-Core rev: 27942f546e6b08cdf9f2dbda2e24d237cde7f5f5) (From OE-Core rev: f83f108f83766d4c141946084b7c4be730c2865e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fontcache: allow to pass different fontconfig cache dirMartin Jansa2015-04-271-3/+1
| | | | | | | (From OE-Core rev: adfb970efcb30af9b3b420b06b66e2aa6cc00ab4) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: fix file_exclude for empty commitsPatrick Ohly2015-03-311-0/+4
| | | | | | | | | | | | | | | The code detecting empty patches after removing files with file_exclude failed for commits which were already empty before (like the initial commit in some repos): such patches are completely empty files, without a From line. Detect that case and just let the normal empty patch detection deal with it. (From OE-Core rev: 6fd7f40728ebf57dfbc367dedeaf350b8d69784c) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: fix file_exclude for dest_dir = .Patrick Ohly2015-03-311-4/+7
| | | | | | | | | | | | | | | | "filterdiff -x ./some/file" does not remove changes for some/file. We must be more careful about constructing the path name and only add the prefix when it really means a directory. While at it, also better normalize the path in copy_selected_files() early on, to handle double slashes. Useful should the function ever gets used for something other that dest_dir (which gets normalized in sanity_check()). (From OE-Core rev: 6c93520b5aaceefecccd83dc77e8ad7681d312c6) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: clean up dest_dir checkingPatrick Ohly2015-03-311-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty dest_dir is basically undocumented behavior. The sample conf only mentions using just a dot for the current directory. In practice, the empty string does not work because of code like this: def action_splitpatch(conf, args): ... if dest_dir != ".": filerange_root = '%s -x "%s/*"' % (filerange_root, dest_dir) However, the empty string was not explicitly checked for, leading to strange errors when trying to apply patches: [12:50:23] Applying: foobar: xyz fatal: unable to stat newly created file '/foobar': No such file or directory This patch turns the empty string into an alias for the dot. This seems more user-friendly than throwing an error. This alias is intentionally not document in the sample conf, because the dot is clearer and works also with older copies of combo-layer. Instead of checking for both all the time and normalizing the path when needed (as done in some places), rewrite the value in sanity_check() and then only check for '.'. (From OE-Core rev: a8547b3c2c0b8bf3150043b1b6570f0d44b20335) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-git-proxy: Redirect error messages to STDERRJuro Bystricky2015-03-311-1/+1
| | | | | | | | | | | | | | | | | | | oe-git-proxy script needs socat. If socat is not found, an error message is issued on STDOUT. This leads to a misleading git message: fatal: protocol error: bad line length character: ERRO instead of the intended message: ERROR: socat binary not in PATH Redirecting the error message to STDERR fixes this issue. (From OE-Core rev: d611d7009631aa8a372f248995b52938163966c6) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: Update templates to 3.19 kernelTom Zanussi2015-03-2448-894/+114
| | | | | | | | | | | Add 3.19 kernel support and remove 3.10 and 3.17 support. 'Fixes' [YOCTO #7391]. (From meta-yocto rev: fe9b3c567230e815f528431f1098626669a9568f) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* postinst_intercept script: drop pipeMatthieu Crapet2015-03-221-1/+1
| | | | | | | | | | Avoid useless subshell. There's no word splitting in variable assignment. (From OE-Core rev: 7b12f4860138d8f5e53ebdfa2a87b59a9ea5c487) Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/combo-layer: Handle update with no repo/revision specifiedRichard Purdie2015-03-201-6/+7
| | | | | | | | | | | Running an update operation with no repo/revision specified was failing. This fixes that code path which worked until the change from: http://git.yoctoproject.org/cgit.cgi/poky/commit/scripts/combo-layer?id=3592507a149b668c0a925e176535f7f2002fa543 (From OE-Core rev: 411a6a3694a9fcd563c5b5320597314fbec75cc2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipetool: fix duplicate licenses being picked upPaul Eggleton2015-03-201-1/+3
| | | | | | | | | | | If a license file matched more than one of the specifications (e.g. COPYING.GPL) then it was being added to LIC_FILES_CHKSUM more than once. (From OE-Core rev: 58316a2890782d206e9b9472ba483367f7560109) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: add dry-run optionPaul Eggleton2015-03-201-0/+16
| | | | | | | | | | | | Add a dry-run option to the deploy-target and undeploy-target subcommands so you can see the list of files to be deployed or un-deployed before actually carrying out the operation. (From OE-Core rev: b9625581f3fe72fc402632be2d87cf889301c6a2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: add an option to disable quiet modePaul Eggleton2015-03-201-3/+12
| | | | | | | | | | | | | | The -q option to scp does stop the progress being shown, which is mostly superfluous, however it also stops errors from ssh being shown - if there's a problem, you'll just get "lost connection" which really isn't that helpful. As a compromise, add a -s/--show-status option and advertise this when the command fails. (From OE-Core rev: 5cbb026212b4c8f5206a07d70b94f57edeee0839) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: detect and error if D is emptyPaul Eggleton2015-03-201-2/+6
| | | | | | | | | | | If you haven't built the recipe yet or if the output directory (${D}) is empty, then we should tell the user rather than have scp error out. (From OE-Core rev: 3fd9ac277393bef5c646f16b9d8f30c277881d70) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: allow disabling host key checkingPaul Eggleton2015-03-201-4/+13
| | | | | | | | | | | | | | | | | | | | | | If you're testing with multiple images/devices that have the same IP address / hostname then it can be annoying to deal with host key mismatches all of the time. As a MITM attack is unlikely in the local test environment, provide a command line option to pass the appropriate options to scp/ssh to disable the host key checking. Note: if you wish to apply this permanently, the best way is to do it through your ssh configuration e.g. by adding the following to your ~/.ssh/config: Host 192.168.7.2 UserKnownHostsFile=/dev/null StrictHostKeyChecking no (From OE-Core rev: 81dd1319112a99bc38b7a7ced0663918ac5b09a4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: modify/extract: prevent usage with incompatible recipesPaul Eggleton2015-03-201-13/+35
| | | | | | | | | | | | Consolidate code for checking compatible recipes and consider meta and packagegroup recipes as well as package-index and gcc-source to be incompatible. (From OE-Core rev: 4be9bf637583b341a89af1b9924752abc7d49c94) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: modify: get correct initial revision from previously extracted ↵Paul Eggleton2015-03-201-2/+13
| | | | | | | | | | | | | | | source tree If you point devtool modify to a source tree previously created by devtool modify or devtool extract, then we need to try to pick up the correct initial revision so that devtool update-recipe knows where to start looking for commits that match up with patches in the recipe. (From OE-Core rev: c20e10543e268ebb43074a3f8d6e7ed991e54ec8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: reset: add ability to reset entire workspacePaul Eggleton2015-03-201-19/+33
| | | | | | | | | | | Add a -a/--all option to allow you to quickly reset all recipes in your workspace. (From OE-Core rev: 0c83788b111a761f6f500b86780cc51aed255402) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: name command line parsers appropriatelyPaul Eggleton2015-03-201-22/+22
| | | | | | | | | | No functional changes, just use a unique name for each parser. (From OE-Core rev: 5fabc59d6221c3fe7137b70e31ec2761a4276a6c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: deploy-target: fix deploying to previously deployed machinePaul Eggleton2015-03-201-1/+3
| | | | | | | | | | | * Pass correct arguments to undeploy() function * If an error occurs during undeploy(), exit instead of continuing (From OE-Core rev: c938dee4b28af7e6296c86347dfa533f85605033) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer-hook-default.sh: handle patches without Signed-off-byPatrick Ohly2015-03-201-1/+8
| | | | | | | | | | | | | | | | Inserting the "From rev" comment depended on having at least one Signed-off-by line in the patch header. Some old repository commits in openembedded-core and bitbake do not have those. When inporting those, just insert at the end of the patch header. While doing so, ensure that there's exactly one blank line since the last non-blank line. (From OE-Core rev: 58548081b15f37452b71c135d5aa8cbbda5b1b61) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer-hook-default.sh: beware of embedded patchesPatrick Ohly2015-03-201-1/+1
| | | | | | | | | | | | | | | Patching the subject line must be limited to the subject of the main patch itself. In particular, git formatted patches embedded in the patch must not be changed. Achieved by limiting the replacement to the lines until the first subject in the patch, just as it is done for modifying the first Signed-off-by. (From OE-Core rev: 2737bd1c3f7c51dd6509a0f91337f695f9c69165) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer-hook-default.sh: avoid duplicating prefixPatrick Ohly2015-03-201-1/+1
| | | | | | | | | | | | The existing patch might already have the desired prefix, perhaps even multiple times (due to some previous import error). Ensure that after the replace, the prefix is present exactly once. (From OE-Core rev: 03be3d350425783a5938a7e4c0b858cda634b71d) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer: partial import for '--history init'Patrick Ohly2015-03-202-0/+53
| | | | | | | | | | | | | | | | | | | | The new "since_revision" property can be used to cut off the imported history at some point. This is useful to keep the resulting repository smaller while still preserving enough history that "git annotate" reports the right author and commit for most lines. The initial, squashed import commit shows up with "unknown" as author in the "git annotate" output. It has the repository name as prefix in the subject line; importing that commit works best with a layer hook which does not add the repository name again when it is already present. Adding it here is useful for hooks which do not extend the subject line. (From OE-Core rev: 74f4c9e3bcdb3c4ca919623086e92a9379bd81ff) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 12:11:57 +0000