summaryrefslogtreecommitdiffstats
path: root/scripts/lib
AgeCommit message (Collapse)Author
2013-07-09yocto-kernel: enforce exact match for BBLAYERSTom Zanussi
The current code uses .startswith to find BBLAYERS, which causes false positives when other variables such as BBLAYERS_NON_REMOVABLE exist. This forces an exact match instead of a partial match. Fixes [YOCTO #4743]. (From meta-yocto master rev: c039def50ca6c02cb1b66fd4bf76664de42c068e) (From meta-yocto rev: bb46a14833d18000e87b76d06df04ef9a7f40afb) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-09yocto-bsp: filter out 'layer' from arch listTom Zanussi
The yocto-layer tool added a new directory alongside the actual architectures and 'common', which is already screened out as not an actual architecture when displaying the architecures. The same needs to be done for 'layer' which isn't actually an architecuture and likewise needs to be screened out. Fixes [YOCTO #4735]. (From meta-yocto master rev: 7459485bf75855a40d124915d38284f737a25cc4) (From meta-yocto rev: 0af5b4550cdb836c68bb5b22fccb8d460fb7d515) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-10yocto-layer / yocto-bsp: tweak layer.conf commentPaul Eggleton
We have recipes-* directories not a recipes directory; this is left over from the old old layout (2010). (From meta-yocto rev: 8adbbb4b688e60113f68d3974310774686551eff) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: change qemu-based mips BSP default branchTom Zanussi
The default branch for the qemu-based mips BSP template no longer exists, so change to one that does. (From meta-yocto rev: 5af614322269ee7c79928d1ff343f2e3bcf35509) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: set SRCREV for arm-based qemu machinesTom Zanussi
arm-based qemu machines won't boot with the default 3.8 machine SRCREV because it's missing the commit 'arm: add dummy swizzle for versatile with qemu', so we need to use a SRCREV that has it merged. (From meta-yocto rev: 176ec06589032b0b589da8345adfc87dddcb74f0) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: qemu machine template updatesTom Zanussi
A few small changes to the machine.conf from the previous version that should be incorporated. (From meta-yocto rev: 05a86a2e8d69b32243ab1915b279411d3d82235f) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: use specific bsp metadata for qemu machinesTom Zanussi
For the qemu-based BSPs, use bsp metadata that's guaranteed to boot in qemu. (From meta-yocto rev: e274a2e66c26489a4da895194eb6e7a9c1476a73) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: pass in file object to replace_file()Tom Zanussi
Pass the file object instead of the filename to replace_file for the custom template, as now required by replace_file(). (From meta-yocto rev: 56091c019000cfe3d22ec464c596d97ae78fc619) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: have replace_file() close file before copyingTom Zanussi
replace_file needs to make sure the file it's replacing is closed before replacing it, otherwise unexpected results may ensue. Fixes [YOCTO #4145]. (From meta-yocto rev: 1339dbb690d51456b4474356992e430638469e47) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: add linux-yocto-3.8-rt to templatesTom Zanussi
RT support is now available in the linux-yocto-3.8 kernel, so we can also add that as kernel option for users. (From meta-yocto rev: 2e425b5c6c7e685e8a0e0c8cb2cf64040e454cad) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-05yocto-bsp: add KBRANCH for existing kbranch casesTom Zanussi
For the cases where a BSP reuses an existing branch, we still need the KBRANCH in order to be able to specify an existing branch. (From meta-yocto rev: 5a3167c4fa6cb53ec501e9de185b93748973ec18) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-22scripts/lib/bsp: replace mesa-dri with mesa in machine.conf filesLaurentiu Palcu
mesa-dri has been renamed to mesa. [YOCTO #3385] (From meta-yocto rev: ba8d5b6dcb6fa4721e85b62f15713072cc0fa23f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-19layer.conf: avoid unnecessary early expansion with :=Christopher Larson
bitbake handles immediate expansions of LAYERDIR for us automatically. (From meta-yocto rev: ee59f1ec94ba8474876603dad1ab32d131227f49) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: add machine-user-features.scc to templatesTom Zanussi
Add the user-features.scc files needed by the new kernel feature support in yocto-kernel. (From meta-yocto rev: 0ef493fbbe412b6e30fc60b892ba6c2e5664307f) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-kernel: add support for destroying recipe-space kernel featuresTom Zanussi
Add a yocto-kernel command allowing users to destroy a recipe-space kernel feature local to a particular BSP. The removed feature is subsequently no longer available for the normal feature addition and removal yocto-kernel commands. (From meta-yocto rev: faa18f56d9412694f2c8e0b0c09e751cb7f3a743) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-kernel: add support for creating recipe-space kernel featuresTom Zanussi
Add a yocto-kernel command allowing users to create a recipe-space kernel feature local to a particular BSP. The new feature is subsequently available for the normal feature addition and removal yocto-kernel commands used with features defined in the meta branch of linux-yocto kernel repos. (From meta-yocto rev: 13abcd93b9e1591bc45ff5f9eb17b8feb9ac9ae5) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-kernel: add support for printing kernel feature descriptionsTom Zanussi
Add a yocto-kernel command allowing users to print the description and compatibility of a given kernel feature. (From meta-yocto rev: 73b4f1a8d156af6810cdde3af672d6286a7071e7) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-kernel: add support for listing available kernel featuresTom Zanussi
Add a yocto-kernel command allowing users to list all the kernel features available to a BSP. This includes the features contained in linux-yocto meta branches as well as recipe-space features defined locally to the BSP. (From meta-yocto rev: 12f3af8d92456ad9212170decdbe102fc78b58f6) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-kernel: add support for kernel feature add/rm/listTom Zanussi
Add yocto-kernel commands allowing users to add, remove, and list kernel features with respect to a given BSP. Features managed by these commands modify a special machine-user-features.scc file associated with the kernel recipe (.bbappend) of a yocto-bsp-generated BSP. This is analagous to the implementation of similar support for bare config items and patches already implemented for yocto-bsp-generated BSPs. Future patches will add support for providing a list of eligible features as defined by linux-yocto kernels and locally-defined (recipe-space) kernel features. (From meta-yocto rev: ae68d906c5c9854f2cd7ee0870556fbfbd7d94d0) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: upgrade i386 template with emgd 1.16Tom Zanussi
Along with related changes. (From meta-yocto rev: 6e93c881e2323b57f5b102db3b2b54220a06a1b6) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: add support for linux-yocto-devTom Zanussi
(From meta-yocto rev: 637104794a5646869d03ff5851d94199b1584dcf) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: add support for tinyTom Zanussi
(From meta-yocto rev: 61a7cfb5f552586dd13fc553305e334ac53a8ce6) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: update linux-yocto-rt_3.4 .bbappendsTom Zanussi
Simplify by removing unnecessary KMACHINE/KBRANCH and SRC_URI items. Also simplify machine-preempt-rt.scc (From meta-yocto rev: b9973f7761b86e3d4571fe5582759e5405e1d7b4) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: update machine-preempt-rt.sccTom Zanussi
Simplify machine-standard.scc for all the templates. (From meta-yocto rev: ad0d944698a854a281d0beea1c87a0600e98ccbd) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: update 3.4 .bbappendsTom Zanussi
Simplify by removing unnecessary KMACHINE/KBRANCH and SRC_URI items. (From meta-yocto rev: d1224846e5ff6c101bf50011d5d3314cbbd81f61) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: update machine-standard.sccTom Zanussi
Simplify machine-standard.scc for all the templates. (From meta-yocto rev: ac8ec04c50bc8dbf716ff5746c8942566fd5c2bf) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17scripts/lib/bsp/engine.py: add preempt-rt and tiny to map_standard_kbranch()Tom Zanussi
Update map_standard_kbranch() with preempt-rt and tiny variants. (From meta-yocto rev: 48233b051b0599ee745d0b8d24863a08e7440d6a) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: use map_standard_branch()Tom Zanussi
Use map_standard_branch() instead of naming the branch directly. (From meta-yocto rev: 34ec7d4cf53f82adb8de61969d0981344f9a1d87) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17scripts/lib/bsp/engine.py: update map_standard_kbranch()Tom Zanussi
Update map_standard_kbranch() to be consistent with the new changes in meta naming and remove obsolete standard/default mapping. (From meta-yocto rev: 40998ba44e1a4ebb1c165cab1a250025041e0da0) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: update default custom kernelTom Zanussi
Update the default custom kernel to 3.8.y, the current stable kernel available at this point. (From meta-yocto rev: f10f30bf77ee0571c1b5edc083833c5267d013d6) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-17yocto-bsp: add 3.8/remove 3.2 kernel from templatesTom Zanussi
For Yocto 1.4, 3.8 is the preferred kernel and 3.2 is obsolete. (From meta-yocto rev: 5b07921319901a3709492c43397c57bbd2201585) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-07yocto-bsp: prepend includes in machine.scc files with machineTom Zanussi
The names of the -user files were changed to have the machine prepended, but the includes weren't - fix the includes. (From meta-yocto rev: c430d6a0d126df7a51c0f585665de6aebbeac028) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-25yocto-bsp: qualify user files with machine nameBrian A. Lloyd
The bblayer abstraction makes it where multiple layers can be configured and used at the same time. Some layers make changes to support a specific machine, and should not have any affect when other machines are in use. For linux-yocto, all bsps are created with a user-config.cfg and user-config.cfg and user-patches.scc. This means that those files will be pulled from the first location found, which might correspond to files customized for a different machine. Instead of using the names user-config.cfg and user-patches.scc, I propose a machine specific name be used such as {{=machine}}user-patches.scc and {{=machine}}user-config.cfg. This would necessitate that all references changed to these new names, which would affect the yocto-bsp and yocto-kernel scripts. With this change, it would be possible to have multiple machine BSPs searched at the same time and to select which to build against by using a command like MACHINE=qmeux86 bitbake core-image-sato to override the default. Note many of the standard BSPs do not seem to suffer this problem as they do not use the common files user-config.cfg and user-patches.scc that the yocto-* scripts depend upon. Additions by Tom Zanussi: - renamed user-config.cfg to {{=machine}}-user-config.cfg everywhere - renamed user-patches.scc to {{=machine}}-user-patches.scc everywhere - added the user-config/patches SRC_URI items to the qemu -rt kernel recipes - fixed conflicts due to the new open_user_file() helper function - updated user filename conflicts caused by directory renaming - updated custom kernel files to match Fixes [YOCTO #3731] (From meta-yocto rev: c20bef60aa8d52971fb061d4b8d473ad19c03180) Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20scripts/lib/bsp/engine.py: add handling for JSON stringsTom Zanussi
Normally pre-canned properties are supplied as JSON from a file, which the user can specify using e.g. the -i option. We can reuse that basic functionality for dedicated command-line parameters by sythesizing a JSON string containing those param values on the fly and passing that in instead. This adds the ability for the common creation code to accept JSON strings as well as JSON files. (From meta-yocto rev: 5a2e840b24822e018de94ec4f554363b59c4e8bd) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20yocto-layer: add optional layer priority paramTom Zanussi
If the user specifies a layer priority following the layer name, layer creation will proceed without further queries using the specified layer priority and the remaining values defaulted. (From meta-yocto rev: 84a0bd8940f82fb938972d7b026367d40c9472e7) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20scripts/lib/bsp/engine.py: refactor bsp-creation codeTom Zanussi
This does a bit of refactoring of the bsp-generation code to make it generically reusable for generating non-bsp layers. The first user remains the existing yocto-bsp tool; these changes allow a second user, the new yocto-layer tool, to use the same code. (From meta-yocto rev: 1527a0ee7bce08a527c9d80516531b17816dff17) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20yocto-layer: add 'layer' template dataTom Zanussi
Add a 'layer' target containing all the data that will be used to generate a generic yocto layer. (From meta-yocto rev: 198a85f61ebd6435830285b2a9b1b925aea6779e) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20yocto-layer: add help/usageTom Zanussi
This is essentially 'the documentation' for the yocto-layer tool. (From meta-yocto rev: 34229b931bad8fc0e4d4431bb5cb46fccbea03bf) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-20scripts/lib/bsp/engine.py: add yocto_layer_create()Tom Zanussi
Add a new yocto_layer_create() function that will be used to generate a generic yocto layer (for the new 'yocto-layer' command). (From meta-yocto rev: 44acd01bf47c2e0a777e686c9339a6ff951fc972) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-16yocto-bsp: add basic git connectivity checkTom Zanussi
yocto-bsp create does a 'git ls-remote git://git.yoctoproject.org/linux-yocto-3.4.git *heads*' to get the set of existing branches from the kernel repo. If the user isn't connected to the network, or if git isn't configured sanely, yocto-bsp fails with an ugly Python backtrace. We should try to avoid this by doing a basic sanity check for those things before actually running the command. The sanity check can be avoided by specifying -s on the yocto-bsp command-line: $ yocto-bsp create -s test qemu Fixes [YOCTO #3279] (From meta-yocto rev: 496e76f9bed2ed5a04ef757724d2e63d05c7a601) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-kernel: add support for PRs of the form rN to pr_inc()Tom Zanussi
With the addition of custom kernel support, we also need to handle the normal PR format found in .bb files. (From meta-yocto rev: e17570b6bbd36a731f546f800ef5f271ed5c3697) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-bsp: remove patch-related SRC_URI processingTom Zanussi
We no longer have to include patches in the SRC_URI, since things now work using only patch in the .scc file, so remove anything to do with maintaining patches in the SRC_URI and fix up all previous users of that code. (From meta-yocto rev: 8f3cd1f80f898d963797bc96b3fe599f7f8ea343) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-kernel: handle SRC_URIs in .bb filesTom Zanussi
Previously we assumed we were always dealing with .bbappends. With custom kernels, we now have SRC_URIs in .bb files, so add .bb files to the list of file types we examine and modify. (From meta-yocto rev: 4200c5c99b7d61e05b0d9d1580e267e7d6d49760) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-kernel: remove assumption that kernel has a versionTom Zanussi
Kernels don't need to have a PREFERRED_VERSION, so remove that assumption from the code that looks for the kernel definition. (From meta-yocto rev: 2ea9d54ac5ebd80b5306851d62411960f3293ede) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-kernel: don't list comments in config and patch listingsTom Zanussi
After adding comments to the config and patch templates, I noticed they were displayed as items, which they shouldn't be. This prevents them from being displayed. (From meta-yocto rev: 4cd0bde48cd17468923bba80b88d187014cda1a3) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-kernel: create open_user_file() wrapper functionTom Zanussi
With the addition of custom kernels, we can no longer rely on a hard-coded /files directory for BSPs - we need to be able to find the user_config/patches files in a number of different directories. We now hide the search inside a new open_user_file() function that accomplishes the same thing as before but with a more flexible scope. (From meta-yocto rev: 26a7032553e8d8691239368f0f994f948db06eed) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-bsp: add replace_file()Tom Zanussi
Add a function that can be used to replace a template file by a user-specified file. The initial use of this capability is to allow users-specified defconfigs. (From meta-yocto rev: b52a22d40d4701a9515490bdd31c8d0341fb12bc) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-bsp: add 'edit-file' input lineTom Zanussi
Add a subclassed edit box that verifies the existence of a user-specified file. (From meta-yocto rev: 8ca7f688a6a0e41dd6527b1c13ebaa77bbfeba69) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-bsp: add 'edit-git-repo' input lineTom Zanussi
Add a subclassed edit box that verifies the existence of a user-specified git repo. Also adds a verify_git_repo() function that can be used as a basic sanity check for local git setup. (From meta-yocto rev: 64f1176d62ed02d7c61d32fdae11dc8b7d365603) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-13yocto-bsp: update existing templates for linux-yocto-customTom Zanussi
Update existing templates to integrate with linux-yocto-custom. (From meta-yocto rev: 7a8b55bdf499d001b77bb87345eb4eeab6013b2e) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>