summaryrefslogtreecommitdiffstats
path: root/meta/classes
Commit message (Collapse)AuthorAgeFilesLines
* core-image: allow root login when debug-tweaks is enabledSaul Wold2012-09-101-0/+1
| | | | | | | | | | | | | | | | | This allows root to login over ssh with an empty password just like dropbear when the debug-tweaks are enabled, it's important to disable debug-tweaks for a production system as this will leave open a security hole! Thanks to Marc for the settings. Cc: Marc Ferland <marc.ferland@gmail.com> [Yocto #3078] (From OE-Core rev: 13e6aa8bba6ab1ebba1efa23f94af379a8fcb6a9) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: fix incremental rpm image generationRobert Yang2012-09-101-2/+2
| | | | | | | | | | | | | | | | | | * Check ${target_rootfs}/etc/passwd rather than ${target_rootfs}${rpmlibdir} to make sure that it has been previously installed. * Remove the "--nodeps" when incremental image generation, it should take care of the dependencies. Still use "--replacefiles --replacepkgs" in case there are conflicts. [YOCTO #3047] (From OE-Core rev: 2b3df2ec7979a49842df172be442a8794fe68fff) 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>
* bin_package.bbclass: binary package recipe classRobert Yang2012-09-101-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used for the binary package recipe, it's been suggested that it would be a useful feature to be able to easily take an RPM or similar containing a software binary from a 3rd party software vendor and integrate it into an image created by the build system. * Brief introduction - The binary pkg can be .rpm, .deb, .ipk and other formats which can be unpacked by bitbake fetcher. - Let bitbake unpack the bianry package, just like unpack the source package. - Skip the do_configure and do_compile. - Install the files to ${D} - Other steps are similar to the source package's recipe. * Note: - The "subdir" parameter in the SRC_URI is useful for the binary package recipe, so I added an example in the comment. - I have sent a patch to bitbake-devel mailing list to support unpack the .rpm, .ipk, and .deb files. [YOCTO #1592] (From OE-Core rev: 7037f52909b8226d2afed4ac73c902d410afc112) 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>
* package_rpm.bbclass: fix the arch (replace "-" with "_")Robert Yang2012-09-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | rpm can't use the "-" as the arch, which causes problem, e.g., when MACHINE = "beagleboard": * The arch should be armv7a-vfp-neon, but rpm only takes the armv7a, this is incorrect since it is mixed with real arch armv7a. * The nativesdk's arch should be i686-nativesdk (or x86_64-nativesdk), but rpm only takes the i686 (or x86_64), this in incorrect since it is mixed with the arch i686 (or x86_64). Replace "-" with "_" when rpm package and the rootfs generation would fix the problem, I think this is fine since it doesn't change the tune's arch, the package manager doesn't care about the arch's name, but it needs a unify arch system to avoid confusing. This is similar to what we have done on the deb which fixed the arch i486, i586 and so on to i386. [YOCTO #2328] (From OE-Core rev: fc985f511da86400e4fa7d17555216c12eb51666) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* distrodata: replace Tab with SpaceSaul Wold2012-09-101-545/+545
| | | | | | | (From OE-Core rev: adb241958f125cc4c74ac5fbfc00674e7cd7305d) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/mirrors: remove bogus gnutls mirrorPaul Eggleton2012-09-101-1/+0
| | | | | | | | | | | | | | | | This mirror entry which maps to itself plus a slash, if matched, put the fetcher into a circular loop until the stack space is exhausted. A patch has been sent to fix this issue in BitBake, but we should remove the bogus entry as well. (Note that this entry does not actually trigger the issue with current master because the gnutls recipe now uses GNU_MIRROR instead of ftp.gnutls.org, thus the bogus mirror entry is not matched.) (From OE-Core rev: 0de1827a9601143b090f751ea702fdb65a936b77) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image_types.bbclass: add variable for HobKang Kai2012-09-071-0/+3
| | | | | | | | | | | | Add a new variable "IMAGE_EXTENSION_live" for Hob to map image type "live" with real image file extension names. This is for Hob to remove the hard-coded maps. (From OE-Core rev: fe0973df7c72b1acec7feae03a4e13c1f49c8b1f) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/core-image: improve comments listing IMAGE_FEATURESPaul Eggleton2012-09-071-2/+7
| | | | | | | | | Ensure this listing is complete. (Comment change only.) (From OE-Core rev: f9df0be3790ca837e43c41633d17e6ee851cb01d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gsettings.bbclass: fix whitespaceRoss Burton2012-09-051-16/+16
| | | | | | | | | | As nothing in oe-core uses gsettings, it wasn't noticed that the whitespace is wrong. (From OE-Core rev: 1c2afda021f7abf88bc08400beba53c603912382) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/qmake_base: support linux-gnuspe/linux-uclibcspe TARGET_OSPaul Eggleton2012-09-051-1/+1
| | | | | | | | | | | Fix borrowed from OE-Classic. This should fix build failures during do_configure of Qt applications with the p1022ds machine from meta-fsl-ppc, for example. (From OE-Core rev: a19fc8e19a6cc6885a1e0616b1f42cc49c8f2c9f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity.bbclass: Move back to running at ConfigParsed timeRichard Purdie2012-09-051-5/+5
| | | | | | | | | | | | If we don't do this, users can get extremely confused errors since the sanity tests happen too late (after parsing) and don't see the warnings. Also cleanup messages about merging configuration file changes to give better hints at where the updated files may be. (From OE-Core rev: 7b8a68cda7ef8186e834b39e73ee12a55b33f85b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: check for bad SRCREV before branch checksBruce Ashfield2012-09-041-7/+8
| | | | | | | | | | | | | | | | | | do_validate_branches ensures that the desired SRCREV is at the tip of every branch that contains the revision. To do this, it looks for containing branches and processes them. This processing was mistakenly placed before the check for an invalid SRCREV, hence a git error message is seen in the log if a bad SRCREV is used, rather than a clear message. reordering the checks, and fixing a check for master, ensures that clear messages are generated in all cases. (From OE-Core rev: 7e4518bf88af53b09536a3bafcd4c392a094023f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: fix unapplied patch error messageBruce Ashfield2012-09-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | When patches fail to apply, the status of all pending patches should be exported to the logs and to the user. Currently, a missing export of GUILT_BASE makes it look more like an internal error, than a 'normal' patch failure: | [ERROR] unable to complete push | pending patches are: | Patches directory doesn't exist, try guilt-init With this variable exported, we have this: | [INFO] validating against known patches (qemux86-standard-meta) | error: patch failed: Makefile:2 | error: Makefile: patch does not apply | To force apply this patch, use 'guilt push -f' | [ERROR] unable to complete push | pending patches are: | links/files/0002-makefile-patch.patch (From OE-Core rev: b2b2512cbc4196fa0f814be3677517dab30e5b52) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-console: removePaul Eggleton2012-09-042-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | This provides one package group, packagegroup-core-apps-console, which is usually brought in by adding "apps-console-core" to IMAGE_FEATURES. Aside from the naming inconsistencies, this is a group of mostly unrelated packages, none of which are actually "apps". Handling each one: * dbus: should mostly be brought in by package runtime dependencies * avahi-daemon: if you are using packagegroup-base (as all images that inherit from core-image do) this is brought in by having "zeroconf" in DISTRO_FEATURES. * portmap: not very useful by itself; should be brought in by selecting NFS server/client through other means. * psplash (or whatever SPLASH is set to): this has been changed to be an explicit item "splash" in IMAGE_FEATURES. Since this is a fairly fundamental feature, a piece of code has been added to automatically handle this for images still using apps-console-core (and show a warning). (From OE-Core rev: 592d6e602466628d10704835a7b07d3d713f58e1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-qt: rename -demos to -demoappsPaul Eggleton2012-09-041-1/+1
| | | | | | | | | | Try to avoid confusion with the Qt demos distributed with Qt itself. (From OE-Core rev: dbbcc0cb9d2cbc66027c800075b94eb9b7110a00) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/packagegroup: disable superfluous tasksPaul Eggleton2012-09-041-0/+9
| | | | | | | | | | | | | Disable tasks other than do_package* (similar to how image.bbclass disables everything except do_rootfs). This saves a little time as well as neatly avoiding the LIC_FILES_CHKSUM verification within do_configure which is not needed for package groups. (From OE-Core rev: fde2b0db798f03cf297a0d466a9c3a444f1321f3) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-x11*: adjust X11 package groupsPaul Eggleton2012-09-041-3/+3
| | | | | | | | | | | | | | | | | | | Now the Sato pieces have been moved out, rebase packagegroup-core-x11 on packagegroup-x11-mini but using the structure/contents of meta-oe's task-x11 so that it can replace that; rename packagegroup-core-x11-mini to packagegroup-core-x11-base and pull in the xserver/utils packages via packagegroup-core-x11, and move both of these recipes under recipes-graphics. x11-mini is renamed to x11-base as it's what people should build on top of and since x11-mini is newer, the corresponding IMAGE_FEATURES item is less likely to be used in existing user recipes. (From OE-Core rev: 0cc9ced7d96b960994b0671095bc74becfc55e2c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-x11: move out Sato applicationsPaul Eggleton2012-09-041-4/+0
| | | | | | | | | | | | | | Move Sato applications to packagegroup-core-x11-sato. Note that this eliminates both the apps-x11-core and apps-x11-games IMAGE_FEATURES; in practice it is unlikely these were useful to anyone outside of the Sato images however. (From OE-Core rev: 46cc375f29d5ecac7311613514a474f288d7c781) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/packagegroup: add ability to disable complementary packagesPaul Eggleton2012-09-041-0/+3
| | | | | | | | | | | | | This allows package group recipes that do not want the automatic addition of complementary packages (e.g. for SDKs) to still inherit from this class and thus it becomes very easy to determine if a recipe is a package group which we need to do in certain circumstances. (From OE-Core rev: 3a3ae22bc0be5b36e0400986930f30c22a61a74e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/packagegroup: Use package group nomenclaturePaul Eggleton2012-09-041-6/+8
| | | | | | | | (From OE-Core rev: aafd94acaa6517e3322855123c43a7b5cd5916ee) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Rename task to packagegroupPaul Eggleton2012-09-047-51/+57
| | | | | | | | | | | | "Package group" is a much more appropriate name for these than task, since we use the word task to describe units of work executed by BitBake. (From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/core-image: remove erroneous nfs-server commentPaul Eggleton2012-09-041-1/+1
| | | | | | | | | | It has never been true that this enables exporting the entire rootfs. (From OE-Core rev: ecd818f1a7a46aa0eeffe48445f2cf0db5aab67a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/core-image: remove *_IMAGE_FEATURES variablesPaul Eggleton2012-09-041-4/+0
| | | | | | | | | | | | | | | | | This indirection does not add anything in terms of configuration and only serves to increase confusion; and given the nature of these it is unlikely they are being used outside of OE-Core. Change the sato-sdk and sato-dev images to be based on the main Sato image (avoiding the need for a common SATO_IMAGE_FEATURES variable) and eliminate all references to them. Fixes [YOCTO #2458]. (From OE-Core rev: 6488842b0d03cfec9f8675eca5a2e05675decf66) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/core-image: remove SSHSERVER_IMAGE_FEATURESPaul Eggleton2012-09-041-2/+1
| | | | | | | | | | | | | This variable was added in the very same commit that added a mechanism that makes it obsolete: if you have dropbear and you want openssh, you just add ssh-server-openssh to your IMAGE_FEATURES and it will replace dropbear via IMAGE_FEATURES_REPLACES_. (From OE-Core rev: 6c78d99cc2e54a99af22357d7567f64e864949b9) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image.bbclass: Convert runtime_mapping_rename to event handlerRichard Purdie2012-09-021-3/+10
| | | | | | (From OE-Core rev: 05e67417ca3174d1f9279f0de308a9d40933b461) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: fix stripping for kernel modulesTomas Frydrych2012-09-021-1/+1
| | | | | | | | | | | | runstrip(path, elftype, d) does bitwise & on the elftype parameter, so it has to be passed an integer. Passing None fails with: TypeError: unsupported operand type(s) for &: 'NoneType' and 'int'. (From OE-Core rev: 67f21c6c698464959c27c7e65ee537ab4c378944) Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate.bbclass: Remove hardcoded task mappingsRichard Purdie2012-09-021-10/+8
| | | | | | | | | | | | I've not idea why this got left in but as per the comment, it needs fixing and we shouldn't have hardcoded mappings like this. Lets remove it and dynamically generate the data instead. [YOCTO #3039] (From OE-Core rev: 2df064ad46c1510fa8a401c22db4ab3278c3c807) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nativesdk: Switch to using nativesdk as a prefix, not a suffixRichard Purdie2012-09-029-18/+20
| | | | | | | | | | | | | | | As discussed on the mailing lists, using a suffix to package names is hard and has lead to many recipes having to do PKGSUFFIX games. Its looking extremely hard to scale nativesdk much further without hacking many recipes. By comparison, using a prefix like multilib does works much better and doesn't involve "hacking" as many recipes. This change converts nativesdk to use a prefix using the existing multilib infrastructure. (From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nativesdk: Convert to use classextend.pyRichard Purdie2012-09-021-36/+13
| | | | | | | | | | | | This patch converts the nativesdk class itself from operating as a suffix to a prefix (see the proceeding patch for the related changes outside this class). The big benefit here is that we can reuse the generic class extension code. (From OE-Core rev: f01f0b8aed25af889f48fe1afff96feb3d9ed120) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate: Ensure master.list exists if it doesn't alreadyRichard Purdie2012-08-301-0/+4
| | | | | | | | | | This fixes builds where master.list doesn't already exist. This change was meant to be part of the previous sstate commit but ended up separated. (From OE-Core rev: c2109b765b24a7ffe4781257ad3fe4641a3b2a49) 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>
* 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>
* 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>
* 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-251-4/+8
| | | | | | | | | | | | | | 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-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* distutils/steuptools: Fix files layout and unbreak buildsRichard Purdie2012-08-242-1/+2
| | | | | | | | | | | | | | | The last two distutils changes progressivly broke the builds. Firstly they moved things from the site_packages directory to being higher up the tree which introduced package QA warnings as a side effect. Secondly, it interacts badly with setuptools which passes in --root=${D} itself. This patch restores the original directory layout, hence fixing the QA warnings and also passes extra options to setuptools to deal with the --root option it passes. (From OE-Core rev: bed18d5df7915e4127a538be9c7550e185c8c850) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* distutils.bblass: change order of args to install stepMatthew McClintock2012-08-221-2/+1
| | | | | | | | | | | | | | | This let's the user override install-lib argument again if it needs to be something else, otherwise things like python-setuptools won't be able to modify the install-lib dir This fixes a new issue exposed by my previous distutils patch that fixed the python modules default install location. Also, it removes running the install step twice which was inadvertant (From OE-Core rev: 3b23feca31480cc56f55301fd0274e622c40b522) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/package: document do_packages_split argumentsPaul Eggleton2012-08-221-0/+41
| | | | | | | | | | | This function takes quite a number of arguments and can be tricky to use properly; this is not made easier if it is undocumented, so document all of the arguments. (No functional changes, comments only.) (From OE-Core rev: 324fbcc047819b6948d13eda627ec898cb1f1eb8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: fix and enhance the incremental rpm generationRobert Yang2012-08-211-25/+43
| | | | | | | | | | | | | | | | | | | | | | | The incremental rpm generation usually broke when package_rpm.bbclass changed, change its implementation to make it more stable: * It depended on the previous and current saved manifest files in the past, it would break when the manifest changed. Now query the previous and current installed pkgs from rootfs/var/lib and rootfs/install/, this would be more reliable, the manifest's change would not affect it any more. * Add explanations before package_install_internal_rpm to explain what does the function do. * Remove an unwanted "awk '{print $1}'". [YOCTO #2906] (From OE-Core rev: 5d8ca498e09438bd91654fa8b8b2c970956d88e3) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* insane.bbclass: Fix RPATH warning in the face of funny path stringsAndy Ross2012-08-211-1/+4
| | | | | | | | | | | In toolchain edge cases it's possible for the RPATH of a library to be set to something like "/usr/lib/../lib". This should be detected as "/usr/lib" and generate a warning. (From OE-Core rev: 72a924d0686389d648338efd3f675fc85ee2d181) Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/classes: Various python whitespace fixesRichard Purdie2012-08-2116-207/+207
| | | | | | | | | | | It was pointed out we have a number of weird indentations in the python functions. This patch cleans up 3, 7 and other weird indentations for the core bbclass files. It also fixes some wierd (odd) shell function indentation which my searches picked up. (From OE-Core rev: 8385d6d74624000d68814f4e3266d47bc8885942) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/sanity: remove texi2html from required host utilitiesPaul Eggleton2012-08-201-1/+1
| | | | | | | | | | | | | | | texi2html is not actually required to build world of OE-Core anymore, so we don't need to mandate it. The only difference without it (verified with buildhistory) is that groff doesn't produce HTML documentation; the rest of its docs are still produced and packaged and no other packages are affected. Part of the work towards [YOCTO #2423]. (From OE-Core rev: aa1c4519f8e549b43a7d8bc51c5342d3409b464b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel.bbclass: Preserve generated headers only if they existMartin Jansa2012-08-201-2/+4
| | | | | | | | | | * I have 2.6.37 kernel without this directory and do_install now fails after 813256bf7bb6e26d542d5f769e2802564116ebe5 (From OE-Core rev: 9a83afe0794e96590aee374555efea91b3085b91) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>