summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sstate-cache-management.sh: fix it for downloaded fileRobert Yang2012-08-301-1/+19
| | | | | | | | | | | | | | | | | | Fix it for the downloaded sstate cache file * The downloaded sstate cache file is in SSTATE_DIR, and there is a symlink points to it, the sstate cache file should not be removed if the corresponding symlink is kept, it would be removed when the symlink is removed (with -L option). * Fix a comment line. [YOCTO #2897] (From OE-Core rev: 12ed7e6bb215e70b119d5ce123e36e2fd380ff1e) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate.bbclass: Detect overwriting files in sstate controlled directoriesRichard Purdie2012-08-301-1/+44
| | | | | | | | | | | | | | | | | | | | We have a potential problem where two sstate packages try and touch the same file. This adds code which will print a warning whenever this happens. The implementation does but by maintaining a master file list and comparing file accesses against this. There are a number of places we have duplicate accesses which are harmless, mostly in the deploy directory so these are whitelisted. For now the code prints warnings, this could be strengthened in future to become error messages. Whilst working on this code on and off over the past few months various issues were uncovered, some serious. [YOCTO #238] (From OE-Core rev: 1f1b6f93d6b7aa8c9bd9bb5b1826997812e36932) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* glib-2.0: don't disable all debugging functionalityRoss Burton2012-08-302-2/+2
| | | | | | | | | | | | | GLib will use "minimal" debugging on non-development builds and the extra safety net and ability to debug at all is totally worth the small performance cost. If someone has a need for every ounce of performance, a simple .bbappend can restore this option. (From OE-Core rev: 4337545ea05ec9d9f64244bb6be83fab329478d1) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Update lttng-2.0 versionsChristopher Larson2012-08-303-0/+0
| | | | | | | | | | | lttng-modules: 2.0.pre11 -> 2.0.5 lttng-tools: 2.0.1 -> 2.0.4 lttng2-ust: 2.0.2 -> 2.0.5 (From OE-Core rev: 42acc9f4163db2ce13e2b5321a927ee89d00311a) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sysstat: Explicitly disable sensors support.Marc Ferland2012-08-302-1/+3
| | | | | | | | | | | Since no lmsensors recipe exists by default in oe-core, explicitly disable support for it in sysstat. In my case sysstat would fail linking complaining about undefined references when adding my own lmsensors recipe. (From OE-Core rev: 686a2b5201aa5ebe46162a0ad9d60d87c63486e0) Signed-off-by: Marc Ferland <ferlandm@sonatest.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use KBRANCH_DEFAULT in 'newbranch' casesTom Zanussi2012-08-2924-24/+48
| | | | | | | | | | | | | | | The new yocto-kernel way of specifying that the branch sanity check doesn't need to be run is to specify a default kbranch and build that. In the case where we have a new kbranch but it's not yet in the repo, we need to tell it that our new branch is the default and we're building the default and that's how we avoid the sanity check and the subsequent do_validate_branches() failure. (From meta-yocto rev: dadd020c67e901609be3ac13a4ffd8cb28532966) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove obsolete referencesTom Zanussi2012-08-297-18/+0
| | | | | | | | | | | | The logbuf-normal feature is obsolete, so remove any references to it. The dmaengine and hpet features have changed, but don't really need to be added by default to i386 - leave that to the BSP developer. Also, remove a couple duplicate feature references in the .scc files. (From meta-yocto rev: 3f37864d474912d680c2e6ee2a962e9fa61df39b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gail: removeRoss Burton2012-08-291-19/+0
| | | | | | | | | | | | This functionality was integrated into GTK+ 2.13 and we've dropped support for anything before that. [ YOCTO #2954 ] (From OE-Core rev: 5bc4c0593997b046300a8f5b3f63c278aeb31d68) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* intltool: Add Upstream-Status and Signed-off-by to remove-xml-check.patchFlorin Sarbu2012-08-291-0/+4
| | | | | | | (From OE-Core rev: 0d908ef4584ce7baeca87cfc9263e53340fdfc54) Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-export-rootfs and friends: don't put pseudo db in target fsPeter Seebach2012-08-293-11/+14
| | | | | | | | | | | | | | | | | | | | In a few places, we have scripts which use <rootfs>/var/pseudo for the pseudo state directory controlling a given filesystem. This seems possibly risky because it means that stuff running under qemu or whatnot could wipe out the data being used to handle that rootfs. Move this to: <rootfs>/../$(basename_rootfs).pseudo_state to avoid problems. This also solves at least one case (not directly hit by yocto's tree) wherein you could end up trying to remove a rootfs while pseudo was using a database inside that rootfs, and thus the remove would fail. (From OE-Core rev: aa5d6bd006d3b4eede21d8987451876ed3385ab8) Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ethtool: package update 3.4.1 -> 3.5Constantin Musca2012-08-291-2/+2
| | | | | | | (From OE-Core rev: 812ec5434be01154c225b672a0ad4dcfb9d927ae) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* perf: add bison and flex to DEPENDSTom Zanussi2012-08-291-1/+2
| | | | | | | | | | perf depends on bison and flex for event parsing - add them as dependencies. (From OE-Core rev: f04b0ddb7a392425ba5890026564bc3521a32c67) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver.bbclass: fix the remove errorRobert Yang2012-08-292-49/+27
| | | | | | | | | | | | | | | | | | | | | * The "tar-package" is used for saving the "Source" list for rpmbuild, there is no such a file when "ARCHIVER_MODE[type] ?= srpm", and there would be errors, it hadn't happen before was becuase that the remove function didn't work. Let the "rpmbuild --rmsource" to remove the Sources, and the remove function will just remove the tar-package file. * Remove several unwanted "try ... exception" sentences, let the error raise rather than ignore them when the error happens. * Remove several un-needed code. [YOCTO #2619] (From OE-Core rev: 6ac3e8be0307ecaea5e92f8bda94f1cd2193a47a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* copyleft_compliance.bbclass: remove the duplicated codeRobert Yang2012-08-291-48/+3
| | | | | | | | | | | | | A part of the code in copyleft_compliance.bbclass is duplicated to archiver.bbclass, remove the duplicated lines. [YOCTO #2619] (From OE-Core rev: 731e1171d6c35ed086b36c081f48dba2015319f8) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver.bbclass: remove the "upper()" functionRobert Yang2012-08-292-21/+17
| | | | | | | | | | | | | | The configuration value from the conf file is lower case, e.g. srpm, tar, so there is no reason to use the upper case which makes things complicated. [YOCTO #2619] (From OE-Core rev: 036a2502689092bb278b929f6e8ef2a119c1cf35) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver.bbclass: fix the fakeroot and other issuesRobert Yang2012-08-292-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix the fakeroot issue The archiver.bbclass is used for archiving sources, patches, and logs, it uses the "rpmbuild -bs" from the package_rpm.bbclass to generate the .src.rpm, but it didn't work (it's not easy to explain it clearly): Reason: - It directly used the "fakeroot" command, we don't have such a command in native tools, so it would use the fakeroot from the host, and it would fail when there is no fakeroot on the host. - The "rpmbuild -bs" doesn't need to work under root, but it is in the function do_package_write_rpm which is running under fakeroot, and "rpmbuild" needs to know the source file's user/group name, the source file is the tarball which is created by the postfuncs of do_unpack or do_patch which doesn't use the fakeroot, so the created file's owner would be the real user, e.g.: robert, but there is no such a user under our native tools' fakeroot(pseudo), then the rpmbuild would fail. It worked when use the host's fakeroot in the past was because that the host's fakeroot knows the users on the host. Fix: - Remove the incorrect "fakeroot". - Change the source file's owner to root.root under fakeroot will fix the problem. * Other fixes: - The typo: "do_remove_taball -> do_remove_tarball" which will cause the tarball is not removed. - Add the _sourcedir defination to the rpmbuild command since the the SOURCES would be added to the specfile when archiver.bbclass is inherited, otherwise there would be errors when "rpmbuild -bb", though the build is OK. It only added the defination to "rpmbuild -bs", didn't add to "rpmbuild -bb". [YOCTO #2619] (From OE-Core rev: ac152f277fdff256def01af4268215a05685a0f7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver.bbclass: fix the coding styleRobert Yang2012-08-294-125/+190
| | | | | | | | | | | | | | | * Make the comment line under 80 characters. * Use the triple double quotes for the docstring. * Add a whitespace behind the comma (,). * Other minor fixes. [YOCTO #2619] (From OE-Core rev: 885a95992abe11ebef7a8e4363e6002ee80403bf) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver.bbclass: indent fixesRobert Yang2012-08-292-379/+379
| | | | | | | | | | | | | | | | | | | Several fixes: * It uses mixed tab and whitespace as the indent in one function, Fix them to use "4 spaces" as the indent. * Remove the unwanted blank, for example, more than one blank lines appeared together. * Remove the tail whitespace. [YOCTO #2619] (From OE-Core rev: 5eacbcdf306d9e743164a1563559cd24eb5fffe0) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ia32-base.inc: new include fileTom Zanussi2012-08-291-0/+58
| | | | | | | | | | | | | | | | | | This is the ia32-base.inc moved over from meta-intel. See meta-intel for the complete history of contributions to this file. Here's the initial commit text that explains the purpose of this file: The meta-intel BSPs currently have a number of machine settings common to all - factor these out into a common include file. Also add several new intel-specific XSERVER variables for building XSERVER variables in BSPs. (From OE-Core rev: 9a8b4fcac639404caa8ac87717118b3380239838) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* staging.bbclass: Might as well drop the applications, fonts and pixmap ↵Richard Purdie2012-08-291-0/+1
| | | | | | | | | | | | directories from ${datadir} These cause various file conflicts and aren't useful within the sysroot anyway. We might as well remove them. Whitelisting the contents of ${datadir} that *is* useful might be a better option in future. (From OE-Core rev: c9fdd2fd108fa557d8f60339405447b4ea4d6f64) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* udev: Drop hid2hci, its provided by bluez4 nowRichard Purdie2012-08-292-1/+4
| | | | | | | | | | Our bluez4 recipe provides hid2hci now. udev removes this as of version 169, we might as well remove it now to stop conflicts over the file in both target file systems and the build sysroots. (From OE-Core rev: 1b5aa7ce6ef22c015e0ab8463ba528f916c421b0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* e2fsprogs: Drop fsck binaryRichard Purdie2012-08-291-3/+3
| | | | | | | | | | | | | | There are conflicts in the native sysroot over the fsck binary. Whilst providing people with alternatives is good to a point, the source in util-linux is clearly the copy which is now being maintained and moved forwards which the copy in e2fsprogs being older and with less features. The simplest solution is simply to no longer offer this and used the maintained version from util-linux. (From OE-Core rev: 98b1b9f047ef9a4aeb170ec3d588fcd41c9be89b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* e2fsprogs: Fully remove/disable blkidRichard Purdie2012-08-292-8/+4
| | | | | | | | | | | | | | | We've removed libblkid from e2fsprogs as it was being provided by util-linux. The blkid binary is also provided there and providing it within e2fsprogs too, linked against a different and potentially incompatible library we're likely asking for trouble. It also leads to inconsistencies in the native sysroot since we don't consistently get one given provider of blkid (but always the liblibid from util-linux). To clean this up, fully remove/disable the blkid binary and package. (From OE-Core rev: fb8e776ea91c39d586b46400ad30aeea8dead1c4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: compile tar-replacement firstlyRoy.Li2012-08-291-1/+6
| | | | | | | | | | | | | | | | | | | | | Compiling tar-replacement or not is decided by version of host tar, if the host tar version is lower than 1.23, Compiling tar-replacement is needed. When doing popoluate tar-replacement sysroot to write the tar to sysroot, but writing is not finished. other packages probably use the being written tar to unzip file, which will lead to failure and report the below error: "bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/tar: Text file busy" Now we compile tar-replacement firstly to ensure that a being written tar command will not be used. (From OE-Core rev: 3c1c4719fc96f6f1fbb257413d6baf3d91fdf4e8) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add missing xserver-xf86-config .bbappend for qemuTom Zanussi2012-08-251-0/+2
| | | | | | | | | | Re-add xserver-xf86-config which was inadvertently removed. (From meta-yocto rev: 08c0c5c53ba625f28eb243968c9c3844ba99d780) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use base branches for qemu 'newbranch' caseTom Zanussi2012-08-254-8/+8
| | | | | | | | | | | The branch updating for the [YOCTO #2587] fix inadvertently changed some of the qemu branch names incorrectly, fix it. (From meta-yocto rev: dde4cd9f88093b8c520a6a42f9dda917f4aff5e4) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove YOCTO_KERNEL_EXTERNAL_BRANCH usageTom Zanussi2012-08-2524-82/+0
| | | | | | | | | | | YOCTO_KERNEL_EXTERNAL_BRANCH is now obsolete, so remove it from the templates. (From meta-yocto rev: 0c440984f3f429d5282559208313dfe7492b8b90) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use emgd 1.14 for i386 templateTom Zanussi2012-08-252-5/+5
| | | | | | | | | | Make i386 template use emgd 1.14, along with associated changes. (From meta-yocto rev: 69f49f7e8370112164b70b9a5ae6f3c0e1ce0bfa) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update standard branch mappingTom Zanussi2012-08-251-3/+3
| | | | | | | | | | Remove mapping for 3.0 and add mapping for 3.4. (From meta-yocto rev: e4ddfcda2cc6aad0c3e99066d43d69f5c1ab2f18) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add 3.4/remove 3.0 kernel from templatesTom Zanussi2012-08-2523-155/+152
| | | | | | | | | | For 1.3, 3.4 is the preferred kernel and 3.0 isn't supported. (From meta-yocto rev: ef7f8257ec9830e3eab0acec20564105d23a74f7) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: generate default properties even if json specifiedTom Zanussi2012-08-251-2/+2
| | | | | | | | | | | | | Users seem to want to specify incomplete property sets when using json input. Allow this by generating default properties before the user-specified properties are applied; the user will then get the defaults for any unspecified values, and avoid cryptic backtraces. (From meta-yocto rev: 3f0361f77cf64844da93ba4a76c42cd5befff5ad) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use emgd 1.10 for i386 templateTom Zanussi2012-08-253-4/+9
| | | | | | | | | | | Make i386 template use emgd 1.10 for denzil, along with associated changes. (From meta-yocto rev: 7a93139bcaca7639da0f182356153d2a7539e0c3) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add i586 option for i386Tom Zanussi2012-08-251-2/+5
| | | | | | | | (From meta-yocto rev: e5bc15354dccd7ecff3cc61af4299befb9d2bc86) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add some standard policyTom Zanussi2012-08-254-0/+28
| | | | | | | | | | Add some useful default options to to the i386 and x86_64 templates. (From meta-yocto rev: 2f98c6dfce82d670acf54bb93c827cf142539b98) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: remove 'branch' statements in .scc if reusing branchTom Zanussi2012-08-257-8/+7
| | | | | | | | | | | If reusing a branch (need_new_branch == 'n') we don't need to branch in the .scc, so make it conditional on need_new_branch. (From meta-yocto rev: 1e698ad2d18249c6224821bd52e3b979750db256) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use rstrip() for assignment linesTom Zanussi2012-08-251-1/+1
| | | | | | | | | | | | strip() isn't necessary and causes unintended formatting changes in the output; rstrip() remove the trailing newlines as intended while leaving indenting whitespace intact. (From meta-yocto rev: 0caa6cd8c094b531ee8e78154dbf5a8e6014d1fd) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use standard branch mapping in bsp templatesTom Zanussi2012-08-253-4/+4
| | | | | | | | (From meta-yocto rev: 716fdb4b1bd7cb91b07753b6747767ae55eeb1d2) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: add standard branch mappingTom Zanussi2012-08-251-0/+21
| | | | | | | | | | | Add a mechanism to distinguish common-pc variants of standard branches. (From meta-yocto rev: c313ad936499104235c47f05bd98ef86b990d713) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: use branches_baseTom Zanussi2012-08-2524-80/+80
| | | | | | | | (From meta-yocto rev: 027c010b6864741cbbefdc710e36963767d7a431) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: allow branch display filteringTom Zanussi2012-08-252-0/+26
| | | | | | | | | | | Add a "branches_base" property that can be used to allow only matching branches to be returned from all_branches(). (From meta-yocto rev: c3481e22fc4690ff5e449f9c16c2453fa964205d) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: update default branch namesTom Zanussi2012-08-2524-46/+46
| | | | | | | | | | | | | Make sure the default branch names match branch names found in the kernel branch listing. Fixes [YOCTO #2587]. (From meta-yocto rev: a46fc3dad25eac4a28265c956913f46ef25c0cee) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-bsp: strip '/base' from kernel branches in templatesTom Zanussi2012-08-2524-48/+48
| | | | | | | | | | | | | For new branches, users can specify /base branches, but we don't want the '/base' in the resultant branch name, so remove it. Fixes [YOCTO #2693]. (From meta-yocto rev: 40e925862884fd981dec63fc598326c73e4a4c20) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* terminal.py: use unique ids for screen sessionsJason Wessel2012-08-251-1/+3
| | | | | | | | | | | | | | | | | | When running multiple sets of builds on the same system, it is hard to distinguish which build belongs to which screen session and you can end up resuming the wrong session. The simple solution is to just append the process id to the screen session invocation to make each unique. (From OE-Core rev: 1677b736bca5dc46db522da1874459d2de77209d) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf: add variables to exclude from hash.Mark Hatle2012-08-251-1/+1
| | | | | | | | | | | The parallelism flags should not change the parse hash. (From OE-Core rev: 6bfd4a6abd7488e663598620f4436ac49183528f) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel-yocto: don't require meta branch for custom reposBruce Ashfield2012-08-251-2/+3
| | | | | | | | | | | | | | | | | | | The commit a9f11849 [linux-yocto: explicitly export KMETA to scripts] allows the meta branch name to be changed by exporting it to all phases of the build. But if a custom kernel without a meta branch is built, we end up passing an empty string to the creation scripts, which breaks the build since input is expected. Inhibiting the export of KMETA to the creation scripts when empty fixes the problem. (From OE-Core rev: 61162fbe01993659301fe2e821bf9c3e801206d8) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel-yocto: set master branch to a defined SRCREVBruce Ashfield2012-08-252-5/+9
| | | | | | | | | | | | | | To support custom repositories that set a SRCREV and that only have a single master branch, do_validate_branches needs a special case for 'master'. We can't delete and recreate the branch, since you cannot delete the current branch, instead we must reset the branch to the proper SRCREV. (From OE-Core rev: de5bb5879fa3282c46dc1ede36af34eaab8f647f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel.bbclass: fix INC directory for SLANGLiang Li2012-08-255-29/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the kernel's tools/perf/Makefile CFLAGS was previously hard coded to contain "-I/usr/include/slang" to work with hosts that have "/usr/include/slang/slang.h" as well as hosts that have "/usr/include/slang.h". This path can cause compile warnings like: cc1: warning: '/usr/include/slang' doesn't exists. or cc1: warning: include location "/usr/include/slang" is unsafe for cross-compilation [-Wpoison-system-directories] Then in some cases warnings become errors if WERROR is enabled hence build errors. In coordination with a kernel fix, we can fix this error for all kernels by modifying the perf Makefile within the staged kernel source. (From OE-Core rev: 4e0daf05ed04e9fb4343032c6290a379f53b89f3) Signed-off-by: Liang Li <liang.li@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: fix Nothing PROVIDES 'grub-efi-x86_64-native'Mihai Lindner2012-08-251-1/+1
| | | | | | | | | | | | | "ERROR: Nothing PROVIDES 'grub-efi-x86_64-native'" is returned when trying to build meta-intel/meta-cedartrail with DEFAULTTUNE = "core2-64" Used TRANSLATED_TARGET_ARCH instead of TARGET_ARCH in grub-efi.bbclass [YOCTO #3013] (From OE-Core rev: 20e2aaacb36113604c4ea7c40dd0bbbf224b8360) Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kmod-native_git.bb: fix builds for hosts with older libcMatthew McClintock2012-08-252-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | kmod will fail to build with the following error because O_CLOEXEC is not defined: | libkmod/libkmod-module.c: In function 'kmod_module_get_initstate': | libkmod/libkmod-module.c:1640: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-module.c:1640: error: (Each undeclared identifier is reported only once | libkmod/libkmod-module.c:1640: error: for each function it appears in.) | libkmod/libkmod-module.c: In function 'kmod_module_get_refcnt': | libkmod/libkmod-module.c:1754: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-module.c: In function 'kmod_module_get_sections': | libkmod/libkmod-module.c:1913: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-file.c: In function 'kmod_file_open': | libkmod/libkmod-file.c:282: error: 'O_CLOEXEC' undeclared (first use in this function) | libkmod/libkmod-file.c:282: error: (Each undeclared identifier is reported only once | libkmod/libkmod-file.c:282: error: for each function it appears in.) Since we are only using kmod-native for depmod, and it's a non-threaded user of this libary being built this should be safe to override O_CLOEXEC. Keep in mind this is ONLY effecting the native builds and not what is being shipped in the root file system. (From OE-Core rev: edcb57fe308979cc5b92359d064e32bb70d4ad76) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base-passwd: upgrade to 3.5.26Constantin Musca2012-08-253-4/+2
| | | | | | | | | | The S variable is now the default one. (From OE-Core rev: a8b1081791af60873c6fd26cbf298cfe1886f97d) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>