summaryrefslogtreecommitdiffstats
path: root/meta/classes/cml1.bbclass
Commit message (Collapse)AuthorAgeFilesLines
* cml1: remove diffconfig return code checkingBruce Ashfield2017-10-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following commit: [ commit 578c8205fd14c48c6d30ef2889d86f1b4aee060a Author: Mikko Rapeli <mikko.rapeli@bmw.de> Date: Thu Jun 22 16:23:14 2017 +0300 meta: Fix return value checks from subprocess.call()'s Python function subprocess.call() returns the return value of the executed process. If return values are not checked, errors may go unnoticed and bad things can happen. Change all callers of subprocess.call() which do not check for the return value to use subprocess.check_call() which raises CalledProcessError if the subprocess returns with non-zero value. https://docs.python.org/2/library/subprocess.html#using-the-subprocess-module All users of the function were found with: $ git grep "subprocess\.call" | \ egrep -v 'if.*subprocess\.call|=\ +subprocess\.call|return.*subprocess\.call' Tested similar patch on top of yocto jethro. Only compile tested core-image-minimal on poky master branch. Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> ] Added return code checking to do_diffconfig. Although the change is well intentioned, it isn't correct in this instance since 'diff' returns '1' to indicate that there are differences in the files .. and not as an error code. subprocess.check_call() flags this as an error and the routine aborts. We are already checking the inputs, and in fact already know there's a diff in the files before we even make the call, so there's no need to look for an error in this case. Putting back subprocess.call() restores the routine to working order. [YOCTO #12132] (From OE-Core rev: ec48b8fd79181978f90b4b0ab00fbe78ddbd416e) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Revert "cml1.bbclass: wait until menuconfig terminal finishes"Leonardo Sandoval2017-08-091-21/+1
| | | | | | | | This reverts commit d2ebee7c3a0c8ab9a09ebad12a2fda51f8d10954. (From OE-Core rev: da7bc68c399bbcd1baf946931200eba72268b0b3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: wait until menuconfig terminal finishesLeonardo Sandoval2017-07-301-1/+21
| | | | | | | | | | | | | | | | | | There are at least two terminals types (gnome and tmux) that when launched to show the kernel's menuconfig, we lost track of the corresponding process ID, thus there is no way to see when they finish, yielding identical timestamps before and after menuconfig thus compile's task is never tainted. This commit takes the solution from [1] but now in the menuconfig's context. [1] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=c706bfbabbf9f7caf2cf509eb91381fb49aa44cb [YOCTO #11146] (From OE-Core rev: 7d02ea283b6587f3f79c5846b64b9ba1d6fe8026) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Fix return value checks from subprocess.call()'sMikko Rapeli2017-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Python function subprocess.call() returns the return value of the executed process. If return values are not checked, errors may go unnoticed and bad things can happen. Change all callers of subprocess.call() which do not check for the return value to use subprocess.check_call() which raises CalledProcessError if the subprocess returns with non-zero value. https://docs.python.org/2/library/subprocess.html#using-the-subprocess-module All users of the function were found with: $ git grep "subprocess\.call" | \ egrep -v 'if.*subprocess\.call|=\ +subprocess\.call|return.*subprocess\.call' Tested similar patch on top of yocto jethro. Only compile tested core-image-minimal on poky master branch. (From OE-Core rev: 578c8205fd14c48c6d30ef2889d86f1b4aee060a) Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/scripts: Various getVar/getVarFlag expansion parameter fixesRichard Purdie2017-01-091-1/+1
| | | | | | | | | | | | | | | | | There were a few straggling expansion parameter removals left for getVar/getVarFlag where the odd whitespace meant they were missed on previous passes. There were also some plain broken ussages such as: d.getVar('ALTERNATIVE_TARGET', old_name, True) path = d.getVar('PATH', d, True) d.getVar('IMAGE_ROOTFS', 'True') which I've corrected (they happend to work by luck). (From OE-Core rev: 688f7a64917a5ce5cbe12f8e5da4d47e265d240f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: remove True option to getVar callsJoshua Lock2016-12-161-2/+2
| | | | | | | | | | | | | getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1: fix tasks after default [dirs] changedRoss Burton2016-08-041-0/+2
| | | | | | | | | | | | These tasks relied upon [dirs] being ${B} by default. As the functions are not simple, add back [dirs] so they work again. [ YOCTO #10027 ] (From OE-Core rev: 614d976ee97d6386c37afb54add5b83741ca401e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1/sstate: Fix missing getVar parameterRichard Purdie2016-02-191-1/+1
| | | | | | (From OE-Core rev: 84065e9b33e6d401e4e50436665838be2d0267ad) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: fix do_menuconfigMarkus Lehtonen2016-02-191-1/+2
| | | | | | | | | | | The functionality got broken after bitbake commit 8bf33a8e92c0e188fa392030025756196c96fcbb which disabled the (bitbake) variable expansion inside python functions. (From OE-Core rev: 51c6ea30060eeddf93e4255cbd3847fc6aedaf9f) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: make menuconfig task configurableStefan Müller-Klieser2015-08-111-1/+2
| | | | | | | | | | | | | | | | | Menuconfig is sometimes not the most convenient way to configure a kernel, as the default color scheme can be hard to read. This variable gives you access to the MENUCONFIG_COLOR variable or lets you select nconfig, e.g. by setting it in your local.conf: KCONFIG_CONFIG_COMMAND = "MENUCONFIG_COLOR=mono menuconfig" or KCONFIG_CONFIG_COMMAND = "nconfig" (From OE-Core rev: fd8880aee4f0f8a535616ef312b283f401f64c7c) Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ncurses, busybox, cml1.bbclass: Fix menuconfig display corruptionJason Wessel2014-11-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously there was a change to the ncurses compile to make it more like the typical way it was compiled on a host system. This fixed a whole class of host machines, but masked the real underlying problem with the display corruption issues and menuconfig. The corner case that led to the discovery that the wrong curses.h file was getting used was when there was no curses libraries at all on one of the development hosts. What had happened before was that /usr/include/curses.h on the host system had to match closely enough to the curses.h in the sysroot and then linking against the sysroot version of curses.so was ok (meaning no display corruption). But on some systems with ncurses.h vs curses.h such as SuSE hosts, there were still issues. If we fix the root of the problem and force the mconf and lxdialog to use the correct headers and libraries from the sysroot there is no further issues and the menuconfig target works properly. It also means we can back out the custom compilation flags to the ncurses recipe because they are no longer needed. For the kernel part of the menuconfig / nconfig changes it will be merged separately and this is all based on: https://lkml.org/lkml/2013/3/3/103 (From OE-Core rev: 889e02659dd396feba24f0b0ee6b4043c3f3735a) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: fix diffconfig diff commandMaciej Borzecki2014-08-151-1/+1
| | | | | | | | | | | | | Commit 6a7b98993350d0d24eae0058ae26ae19cfdf7c4c introduced a typo in command, a whitespace was missing between --new-line-format and path to original file. As a result, diffconfig task did not work, diff failed with exit status 2, resulting in empty fragment.cfg. (From OE-Core rev: 8c75aa7c30cc5a796962d099896ca2a9a16c3a06) Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl> Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1: correct diffconfig output formatStefan Müller-Klieser2014-07-291-1/+1
| | | | | | | | | | | | | If used with some packages using kconfig mechanism, the diffconfig command generates wrong output format. Diff provides all options to format the output correctly. This method formats as intended, is more robust and works with the merge_config.h script from yocto-kernel-tools. (From OE-Core rev: 1d9d035f07be1cef2764949d84cecbff7dd428dd) Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: Add diffconfig task to cml1João Henrique Ferreira de Freitas2014-02-201-0/+33
| | | | | | | | | | | | | diffconfig() is a new task that makes a diff between the old and new config files and writes to the fragment.cfg result file. menuconfig() always copy the original config file, so the user doesn't need to copy it. (From OE-Core rev: f0dcbbdcc37da12f84f730b8235f50be8c150c50) Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: Fix return code handling in do_menuconfig()Jacob Kroon2014-01-281-1/+1
| | | | | | | | | | | | | | | | | | | On my system, doing "bitbake -c menuconfig busybox" pops up a gnome-terminal, I can see that the compilation starts but then the terminal automatically exits. It turns out I don't have ncurses development package installed on my host, and OE's host sysroot isn't being passed to gcc, so compilation fails. The window automatically closes before I can read the error message since the '$' in the return code check needs to be escaped. Make sure the user can read the error message by properly checking the return code. (From OE-Core rev: a2241a92fc48e4286de17b23124a9e2f0fd8185b) Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1: set and export TERMINFO, to handle ncurses-native relocationFahad Usman2012-12-261-1/+2
| | | | | | | | | | | | | | | | | | | ncurses library looks at the compiled-in search path for the terminfo database, and that path no longer exists, when using cached binaries (sstate). Export TERMINFO pointing at the current sysroot, so the attempt to run mconf is able to find the correct terminfo db. (From OE-Core rev: b036adfb868c042245cd8fba8ecc2ba53169bfea) Signed-off-by: Christopher Larson <chris_larson@mentor.com> the patch was imported from meta-mentor layer on yoctoproject git server http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id 0cae284f294e3a2c99d9a4d79c95c25103cd8f8b Signed-off-by: Fahad Usman <fahad_usman@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: Convert tab indentation in python functions into four-spaceJason Wessel2012-09-271-14/+14
| | | | | | | | | | | | Based on the previous commit 604d46c686d06d62d5a07b9c7f4fa170f99307d8 (Convert tab indentation in python functions into four-space), the cml.bbclass was not converted, and in order to properly extend it with external bbappend's it needs to be converted. (From OE-Core rev: e4c1c37bb37e9eba635bc0a9308ab593abd299ec) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Replace "echo -e" with "printf" to have the same behavior in dash or bashAndrei Gherzan2012-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | oe-core removed the prerequisite to have sh as bash. POSIX doesn't define any options and furthermore allows 'echo -e' to be the default behavior. This means that in dash 'echo -e' will actually print '-e' and interpret backslashes by default. We use instead 'printf' builtin command with or without '\n' to simulate 'echo -e' or 'echo -n'. 'printf' needs format while 'echo' can be used without any arguments. So 'echo >' was replaced by 'printf "" >'. 'echo' without '-n' flag adds a new line by default so to keep the same behavior of two new lines while using 'echo "\n"', 'printf "\n\n"' is used. [YOCTO #3138] (From OE-Core rev: a19880ad10ccb5d7d909dcf9de5c3dc58a0ebcd3) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1.bbclass: Only delay exit if the command failsDarren Hart2012-06-251-1/+1
| | | | | | | | | | | | Rather than pause for 5 seconds, test the return code of the command and require user input before exiting on failure. This avoids pausing after successful command execution as well as possibly not waiting long enough if the user happens to be doing something else for 5 seconds. (From OE-Core rev: d99cc2b70bbda9a0cbc09a4430b871c287113041) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/cml1: ensure -c menuconfig forces a rebuild next timePaul Eggleton2012-06-211-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the following results in the kernel being rebuilt, repackaged and re-deployed in the final step: bitbake virtual/kernel bitbake -c menuconfig virtual/kernel [ make changes to the kernel configuration and save ] bitbake virtual/kernel If there are no changes to the configuration saved, the rebuild will not be triggered. Note that this relies on a function recently added to BitBake and requires full hashing (i.e. BB_SIGNATURE_HANDLER must be set to a signature handler that inherits from BasicHash) - if this is not the case or the function is not available in the version of BitBake being used this change will do nothing. Fixes [YOCTO #2256]. (From OE-Core rev: 9bf6b60e1599cf5dd87089d42584583cdfd6807a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cmd1.bbclass: Ensure ncurses is built and used for menuconfig tasksRichard Purdie2012-06-121-1/+7
| | | | | | | | | | | | | | | | | Currently, the task just exits if something goes wrong. This adds the ncurses-native dependency. It also adds a small delay before closing the window so any messages displayed there can be seen. Trying to get the kernel build system to correctly find and link with our copy of ncurses is some kind of nightmare. I ended up having to add it to HOST_LOADLIBES globally for this task which is rather nasty but I couldn't find any other way. [YOCTO #2513] (From OE-Core rev: fe417e8a4d625c6933de72163d2fee52ac47f571) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cml1/kernel: Update do_menuconfig to use oe.terminal()Richard Purdie2011-09-151-7/+4
| | | | | | | | | | The recent environment fixes broke the menuconfig task since it couldn't access variables like DISPLAY. This patch updates it to use oe.terminal instead allowing it to work again. (From OE-Core rev: e876a44fa8ed0aa2e09084c1e7ddfc876c3f981b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel,cml1.bbclass: Move menuconfig to cml1Noor, Ahsan2011-08-041-0/+12
| | | | | | | | | * The menuconfig target exists in places other than the kernel that use kernel style config. (From OE-Core rev: 1ceaf45f634d11b65aab0f591a86865df49c8c90) Signed-off-by: Noor, Ahsan <noor_ahsan@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Rename /openembedded/ -> /meta/Richard Purdie2006-07-211-0/+8
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-11 23:26:13 +0000