summaryrefslogtreecommitdiffstats
path: root/scripts/lib
Commit message (Collapse)AuthorAgeFilesLines
* yocto-kernel: Use variable-substituted BBLAYERSTom Zanussi2013-10-041-55/+38
| | | | | | | | | | | | | | | | The current find_bblayers() code finds and parses the BBLAYERS variable manually, and therefore doesn't handle variable substitution, which causes problems if used. This change makes find_bblayers() use the variable-substituted BBLAYERS instead. Fixes [YOCTO #5106] (From meta-yocto rev: 1629ac04e909143dc2c275c256094cb44c6cc43c) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: Add OpenEmbedded-specific implementationTom Zanussi2013-10-0119-225/+1253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuses the mic/livecd infrastructure but heavily subclasses and modifies it to adapt to the special needs of building images from existing OpenEmbedded build artifacts. In addition to the OE-specific mic objects and modifications to the underlying infrastructure, this adds a mechanism to allow OE kickstart files to be 'canned' and made available to users via the 'wic list images' command. Two initial OE kickstart files have been added as canned .wks files: directdisk, which implements the same thing as the images created by directdisk.bbclass, and mkefidisk, which can essentially be used as a replacement for mkefidisk.sh. Of course, since creation of these images are now driven by .wks files rather than being hard-coded into class files or scripts, they can be easily modified to generate different variations on those images. They also don't require root priveleges, since they don't use mount to create the images. They don't however write to media like mkefidisk.sh does, but rather create images that can be written onto media. (From OE-Core rev: f87acc5e59d3c2c39ff171b5557977dab4c8f4a6) 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>
* wic: Add mic w/pykickstartTom Zanussi2013-10-01134-0/+29181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the starting point for the implemention described in [YOCTO 3847] which came to the conclusion that it would make sense to use kickstart syntax to implement image creation in OpenEmbedded. I subsequently realized that there was an existing tool that already implemented image creation using kickstart syntax, the Tizen/Meego mic tool. As such, it made sense to use that as a starting point - this commit essentially just copies the relevant Python code from the MIC tool to the scripts/lib dir, where it can be accessed by the previously created wic tool. Most of this will be removed or renamed by later commits, since we're initially focusing on partitioning only. Care should be taken so that we can easily add back any additional functionality should we decide later to expand the tool, though (we may also want to contribute our local changes to the mic tool to the Tizen project if it makes sense, and therefore should avoid gratuitous changes to the original code if possible). Added the /mic subdir from Tizen mic repo as a starting point: git clone git://review.tizen.org/tools/mic.git For reference, the top commit: commit 20164175ddc234a17b8a12c33d04b012347b1530 Author: Gui Chen <gui.chen@intel.com> Date: Sun Jun 30 22:32:16 2013 -0400 bump up to 0.19.2 Also added the /plugins subdir, moved to under the /mic subdir (to match the default plugin_dir location in mic.conf.in, which was renamed to yocto-image.conf (moved and renamed by later patches) and put into /scripts. (From OE-Core rev: 31f0360f1fd4ebc9dfcaed42d1c50d2448b4632e) 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>
* wic: Initial code for wic (OpenEmbedded Image Creator)Tom Zanussi2013-10-013-0/+589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial implementation of the 'wic' command. The 'wic' command generates partitioned images from existing OpenEmbedded build artifacts. Image generation is driven by partitioning commands contained in an 'Openembedded kickstart' (.wks) file specified either directly on the command-line or as one of a selection of canned .wks files (see 'wic list images'). When applied to a given set of build artifacts, the result is an image or set of images that can be directly written onto media and used on a particular system. 'wic' is based loosely on the 'mic' (Meego Image Creator) framework, but heavily modified to make direct use of OpenEmbedded build artifacts instead of package installation and configuration, things already incorporated int the OE artifacts. The name 'wic' comes from 'oeic' with the 'oe' diphthong promoted to the letter 'w', because 'oeic' is impossible to remember or pronounce. This covers the mechanics of invoking and providing help for the command and sub-commands; it contains hooks for future commits to connect with the actual functionality, once implemented. Help is integrated into the 'wic' command - see that for details on usage. (From OE-Core rev: 95455ae4251e06d66e60945092b784d2d9ef165c) 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>
* yocto-bsp: add 3.10/remove 3.8 kernel from templatesTom Zanussi2013-09-2475-365/+423
| | | | | | | | | | | | | | | For Yocto 1.5, 3.10 is the preferred kernel and 3.8 is obsolete. This also removes any mention of emgd from the templates - we want to discourage users from using it - it will be obsolete soon in any case. Fixes [YOCTO #5107] (From meta-yocto rev: 4dd4bf6ac2dcc7652ec8f807df02298546bdb41b) 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>
* yocto-bsp: conditionalise mesa-swrast on opengl in templatesRoss Burton2013-09-111-1/+1
| | | | | | | | | | | As per the similar commit in oe-core on the qemu machines, the templates should respect the opengl DISTRO_FEATURE when adding mesa-driver-swrast to new qemu machines. (From meta-yocto rev: 8d42ea2b2566913642c759e48ffe1f5f5166c510) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove apm as a default MACHINE_FEATURESaul Wold2013-09-091-1/+1
| | | | | | | | | | | APM is not only obsolete, but also requires a kernel config enabled, which is not enabled by default [YOCTO #5121] (From meta-yocto rev: e25c43661f27b27e61aa7fae868237c1c60e3e25) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-kernel: make BBLAYERS parsing more robustTom Zanussi2013-07-131-14/+24
| | | | | | | | | | | | | This allows the BBLAYERS parsing code to handle cases where BBLAYERS is spread across multiple assignments or all on a single line, within double or single quotes. Fixes [YOCTO #3746]. (From meta-yocto rev: 4ab26d9e655bab0069ffe9b135557d943cf1f524) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-kernel: enforce exact match for BBLAYERSTom Zanussi2013-07-051-1/+2
| | | | | | | | | | | | | | | 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 rev: c039def50ca6c02cb1b66fd4bf76664de42c068e) 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>
* yocto-bsp: filter out 'layer' from arch listTom Zanussi2013-07-051-1/+1
| | | | | | | | | | | | | | | | | 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 rev: 7459485bf75855a40d124915d38284f737a25cc4) 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>
* yocto-bsp: Drop PRINC usageRichard Purdie2013-06-211-2/+1
| | | | | | | | | We no longer need to manually bump PR values so lets not generate code using this. (From meta-yocto rev: ed23b0eee9791b06b0bae1ad17595e72ccaa86cf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto_kernel: modify the msg when adding duplicate itemsNing Zhang2013-06-041-1/+1
| | | | | | | | | | | | | | | | Privious check-in "yocto_kernel: check current items before add a new one" had been merged before I apply the feedback from Zanussi, Tom. Now fix it as a new patch. This fix modify the output message when customer adding duplicate items. [YOCTO #4558] (From meta-yocto rev: 530c6efa85b1798d30db4c6c83a748b100b8c1c3) Signed-off-by: Ning Zhang <ning.zhang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto_kernel: check current items before add a new oneNing Zhang2013-05-301-11/+21
| | | | | | | | | | | | | | | | | When use "yocto-kernel config add" to add the same config many times, all of these are list when use "yocto-kernel config list" to check. This fix modify routine yocto_kernel_config_add, if the new added components already exist in current configuration, just igore them. Now, one config could only be added one time. [YOCTO #4558] (From meta-yocto rev: 655ccc5ed77b52fb62dab5f6cfdf3de39b1bf055) Signed-off-by: Ning Zhang <ning.zhang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: re-enable AutoAddDevices in xorg.conf for generated BSPsPaul Eggleton2013-05-296-6/+0
| | | | | | | | | | | | | This was added quite a long time ago because of poor interactions between HAL and the X server when it came to enabling input devices. HAL is long gone and I think it's safe to say we don't need to disable this any longer, especially as it gets in the way of being able to plug in the keyboard/mouse after boot. (From meta-yocto rev: e06ab1e030e8cfbc259500b1a0b958fe752fb872) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-layer / yocto-bsp: tweak layer.conf commentPaul Eggleton2013-04-102-2/+2
| | | | | | | | | | 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>
* yocto-bsp: change qemu-based mips BSP default branchTom Zanussi2013-04-053-3/+3
| | | | | | | | | | 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>
* yocto-bsp: set SRCREV for arm-based qemu machinesTom Zanussi2013-04-051-0/+3
| | | | | | | | | | | 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>
* yocto-bsp: qemu machine template updatesTom Zanussi2013-04-051-5/+3
| | | | | | | | | | 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>
* yocto-bsp: use specific bsp metadata for qemu machinesTom Zanussi2013-04-051-0/+7
| | | | | | | | | | 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>
* yocto-bsp: pass in file object to replace_file()Tom Zanussi2013-04-051-1/+1
| | | | | | | | | | 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>
* yocto-bsp: have replace_file() close file before copyingTom Zanussi2013-04-051-1/+2
| | | | | | | | | | | | 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>
* yocto-bsp: add linux-yocto-3.8-rt to templatesTom Zanussi2013-04-056-0/+215
| | | | | | | | | | 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>
* yocto-bsp: add KBRANCH for existing kbranch casesTom Zanussi2013-04-0530-0/+90
| | | | | | | | | | 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>
* scripts/lib/bsp: replace mesa-dri with mesa in machine.conf filesLaurentiu Palcu2013-03-222-5/+5
| | | | | | | | | | | 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>
* layer.conf: avoid unnecessary early expansion with :=Christopher Larson2013-03-192-6/+6
| | | | | | | | | 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>
* yocto-bsp: add machine-user-features.scc to templatesTom Zanussi2013-03-1736-0/+30
| | | | | | | | | | 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>
* yocto-kernel: add support for destroying recipe-space kernel featuresTom Zanussi2013-03-172-0/+110
| | | | | | | | | | | | 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>
* yocto-kernel: add support for creating recipe-space kernel featuresTom Zanussi2013-03-172-1/+138
| | | | | | | | | | | | | 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>
* yocto-kernel: add support for printing kernel feature descriptionsTom Zanussi2013-03-172-0/+79
| | | | | | | | | | 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>
* yocto-kernel: add support for listing available kernel featuresTom Zanussi2013-03-172-0/+138
| | | | | | | | | | | | 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>
* yocto-kernel: add support for kernel feature add/rm/listTom Zanussi2013-03-172-0/+197
| | | | | | | | | | | | | | | | | | | | 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>
* yocto-bsp: upgrade i386 template with emgd 1.16Tom Zanussi2013-03-173-7/+7
| | | | | | | | | 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>
* yocto-bsp: add support for linux-yocto-devTom Zanussi2013-03-1712-24/+181
| | | | | | | (From meta-yocto rev: 637104794a5646869d03ff5851d94199b1584dcf) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add support for tinyTom Zanussi2013-03-1712-0/+245
| | | | | | | (From meta-yocto rev: 61a7cfb5f552586dd13fc553305e334ac53a8ce6) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update linux-yocto-rt_3.4 .bbappendsTom Zanussi2013-03-176-73/+18
| | | | | | | | | | 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>
* yocto-bsp: update machine-preempt-rt.sccTom Zanussi2013-03-176-30/+17
| | | | | | | | | 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>
* yocto-bsp: update 3.4 .bbappendsTom Zanussi2013-03-176-73/+18
| | | | | | | | | 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>
* yocto-bsp: update machine-standard.sccTom Zanussi2013-03-171-19/+1
| | | | | | | | | 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>
* scripts/lib/bsp/engine.py: add preempt-rt and tiny to map_standard_kbranch()Tom Zanussi2013-03-171-0/+36
| | | | | | | | | 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>
* yocto-bsp: use map_standard_branch()Tom Zanussi2013-03-173-3/+3
| | | | | | | | | 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>
* scripts/lib/bsp/engine.py: update map_standard_kbranch()Tom Zanussi2013-03-171-8/+6
| | | | | | | | | | 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>
* yocto-bsp: update default custom kernelTom Zanussi2013-03-171-4/+4
| | | | | | | | | | 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>
* yocto-bsp: add 3.8/remove 3.2 kernel from templatesTom Zanussi2013-03-1724-421/+110
| | | | | | | | | 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>
* yocto-bsp: prepend includes in machine.scc files with machineTom Zanussi2013-02-077-14/+14
| | | | | | | | | | 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>
* yocto-bsp: qualify user files with machine nameBrian A. Lloyd2013-01-2545-89/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* scripts/lib/bsp/engine.py: add handling for JSON stringsTom Zanussi2013-01-201-4/+7
| | | | | | | | | | | | | | | | | 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>
* yocto-layer: add optional layer priority paramTom Zanussi2013-01-201-2/+12
| | | | | | | | | | | 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>
* scripts/lib/bsp/engine.py: refactor bsp-creation codeTom Zanussi2013-01-201-65/+76
| | | | | | | | | | | | | 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>
* yocto-layer: add 'layer' template dataTom Zanussi2013-01-209-0/+168
| | | | | | | | | | 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>
* yocto-layer: add help/usageTom Zanussi2013-01-201-0/+228
| | | | | | | | | 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>