summaryrefslogtreecommitdiff
path: root/meta/classes
AgeCommit message (Collapse)AuthorFiles
2013-05-16bbclass: bb.fatal() clean upRobert Yang3
The bb.fatal() is defined as: def fatal(*args): logger.critical(''.join(args)) sys.exit(1) So anything after bb.fatal() in the same code block doesn't have any effect, e.g.: bb.fatal("%s_%s: %s" % (var, pkg, e)) raise e The "raise e" should be removed. I searched all the files which use bb.fatal(), only the following 3 classes have this issues: insane.bbclass package.bbclass package_rpm.bbclass [YOCTO #4461] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-16boot-directdisk: Scope HDDDIR and HDDIMG variables to avoid conflictsJonathan Liu1
These variables should not be shared with other image classes. The bootimg class also has an HDDDIR variable that could be overwritten if executing concurrently in the same image recipe. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-16syslinux: Update to 4.06Jonathan Liu2
Patches are now part of upstream or no longer needed. Added new util-linux dependency for isohybrid. Paths updated to reflect directory structure changes. Add CFLAGS and LDFLAGS overrides. [YOCTO #4438] Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-14image.bbclass: Add package-management image feature to validitemsKhem Raj1
Some images dont use core-image bbclass and add this feature directly Fixes parsing errors like /builds1/angstrom/cache/prserv.sqlite3, IP: 127.0.0.1, PORT: 34734, PID: 24551 Parsing recipes...ERROR: Unable to parse /builds1/angstrom/sources/meta-kde/recipes-images/angstrom-kde-desktop-imag e.bb: Exited with "1" ERROR: 'package-management' in IMAGE_FEATURES is not a valid image feature. Valid features: dbg-pkgs debug-tweaks dev-pkgs doc-pkgs ptest-pkgs read-only-rootfs splash staticdev-pkgs ERROR: 'package-management' in IMAGE_FEATURES is not a valid image feature. Valid features: dbg-pkgs debug-tweaks dev-pkgs doc-pkgs ptest-pkgs read-only-rootfs splash staticdev-pkgs ERROR: Command execution failed: Exited with 1 Signed-off-by: Khem Raj <raj.khem@gmail.com>
2013-05-14package.bbclass: Fix sources contentsRichard Purdie1
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=c376f1f49cea182a2887945840ab97a20970a373 fixed a valid issue where the sources file was accumulating information and subsequent task runs of do_packacge were not cleaning it. The fix is wrong however since we're removing the file within a loop. This fix removes the file outside the loop ensuring it is not truncated and contains the correct information. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-13sanity.bbclass: Attach the missing value to a format string.Peter Seebach1
The tuning changes to sanity.bbclass were almost right, but one of the messages had a %s with no % operator. Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
2013-05-12image-vmdk.bbclass: disable the NOISO = "1"Robert Yang1
The vmdk needed hddimg which was generated by do_bootimg in the past, but do_bootimg generated both iso and hddimg, so we set NOISO = "1", it now uses do_bootdirectdisk, doesn't use do_bootimg anymore, so we don't need NOISO = "1", and need remove it, otherwise: IMAGE_FSTYPES += "live vmdk" Would not generate the iso. I'd like to remove it rather than comment it, but we had comment the do_bootimg before. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-12classes/core-image: drop apps-console-core IMAGE_FEATURES supportPaul Eggleton1
Remove the legacy support for the apps-console-core IMAGE_FEATURES item; we've kept this for a while but it's time for it to go. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-12classes/image: show an error on invalid IMAGE_FEATURESPaul Eggleton1
If the user specifies an invalid feature in IMAGE_FEATURES, show an error during parsing. Valid IMAGE_FEATURES are drawn from PACKAGE_GROUP_ definitions, COMPLEMENTARY_GLOBS and a new 'validitems' varflag on IMAGE_FEATURES (so that additional non-package group features can be added elsewhere.) Implements [YOCTO #3308]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-12image-vmdk: Fix error recreating symbolic linkJonathan Liu1
If the vmdk image symbolic link already exists from a previous build, overwrite it instead of returning an error. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-12imagetest-qemu.bbclass, qemuimage-testlib: add support for more FSTYPESStefan Stanacar1
qemuimage-testlib hardcodes ext3 as fs type. This adds support for more images types which are supported by runqemu: ext[234]/jffs2/btrfs. I've skipped (for now) vmdk (which qemu can boot) because: - we don't have network on images without connman because of the way runqemu starts vmdk images (can't pass kernel args for network config) - qemuimage-testlib-pythonhelper relies on '192.168' being in the output of ps to return the pid Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-10classes/insane: add check for PN in OVERRIDESPaul Eggleton1
If a recipe is named such that its PN value matches something already in OVERRIDES (such as when PN happens to be the same as MACHINE or DISTRO), it can have unexpected consequences. Assignments such as FILES_${PN} = "xyz" effectively turn into FILES = "xyz". Implements [YOCTO #4288]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-10classes/buildhistory: track contents of selected files in imagesPaul Eggleton1
Add a BUILDHISTORY_IMAGE_FILES variable specifying a space-separated list of files within an image to copy into buildhistory, so that changes to them can be tracked. Typically this would be used for configuration files, and by default this includes /etc/passwd and /etc/group, but the user is free to extend this list by setting the variable in local.conf. Implements [YOCTO #4154]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-10boot-directdisk/bootimg/image-vmdk: remove more nostamps for image generationRobert Yang3
We have removed the nostamps for do_rootfs and do_build, so it seems reasonable to remove the stamps for do_bootimg, do_bootdirectdisk and do_vmdkimg. The current problem is that the do_vmdkimg always re-run, but the do_rootfs may not, so the code like below in the do_rootfs function doesn't re-run and cause problems (the symlink exists when the do_vmdkimg creates the symlink again): if d.getVar('IMAGE_LINK_NAME', True): cmds += "\trm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.*" Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-10kernel.bbclass: make FILES package-specificTom Zanussi1
Fix QA warnings seen when using 'traditional' kernel recipes e.g.: WARNING: QA Issue: .../recipes-kernel/linux/linux_3.0.18.bb: Variable FILES is set as not being package specific, please fix this. Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09imagetest-qemu: Fix indentationRichard Purdie1
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09class/lib: Fix up various file access methodsRichard Purdie9
There are various bits of cruft that have built up around our file accesses. This patch cleans some of them up, specifically: * Remove pointless "from __builtin__ import file" * Use open(), not file() * Wrap file usage in a with container to ensure files are closed * Add missing .close() calls in some cases Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09buildstats: Drop spurious open() callRichard Purdie1
This file is already opened a few lines previously, so drop the duplicated call. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09useradd: Use modern join syntaxRichard Purdie1
string.join() is deprecated syntax and doesn't work under python3 so use the modern sytax instead. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09classes/lib: Fix getcmdstatus breakageRichard Purdie3
I mistakenly thought subprocess had getcmdstatus in python 2. It doesn't so lets add a wrapper and have this work in both worlds. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09base.bbclass: Drop unused/obsolete importRichard Purdie1
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09image/kernel-module-split/eglibc-ld.inc: Remove has_key() usageRichard Purdie2
The has_key() attribute has been removed in python 3 since there is better syntax available. Use the improved syntax. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09sanity/patch.py: Remove commands module usageRichard Purdie3
The commands module is removed in python3. Use the subprocess module instead and the pipes module to replace the mkargs usage. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09insane: Open file in binary modeRichard Purdie1
We open the file we're writing to in binary mode so open the input stream with the same mode so things match. This avoids errors with python3. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09classes/lib: Update to use print as a function callRichard Purdie2
In python 3 print is a function call. In some cases bb.note is a more appropriate call to make. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09metadata_scm: Replace deprecated operatorRichard Purdie1
The <> operator is deprecated, use != instead which is equivalent. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09sanity.bbclass: Use open(), not file()Richard Purdie1
file() syntax is removed in python 3, use open() instead. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09classes/recipes/lib: Fix various python whitespace issuesRichard Purdie2
There are some left over tab characters in the python functions. This removes them and resolves python 3 errors. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09classes: Use modern exception raising syntaxRichard Purdie5
Modern expection rasing syntax is function call format, convert to this to keep python 3 happy and model correct coding style in the core. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09buildstats: Update to ensure files are closedRichard Purdie1
python3 doesn't like files being left open. This updates the code style to ensure file are closed. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09clases/lib: Use modern exception syntaxRichard Purdie3
Update older code to use modern exception handling syntax which is the form accepted by python 3. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09bootimg.bbclass: add comment for NOHDDRobert Yang1
Add comment for NOHDD which is used for skipping building the HDDIMG if set to 1 Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-07archive-*-source.bbclass: handle dependency in anonymous functionLaurentiu Palcu3
Using "before do_rootfs" would have this task added to do_rootfs dependencies regardless of the filtering options. Instead, add this dependency in the anonymous python function. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-03buildhistory: change default BUILDHISTORY_DIR to TOPDIRMartin Jansa1
* like PERSISTENT_DIR I find BUILDHISTORY_DIR more persistent then tmp-eglibc directory * WARN: people with existing checkouts in TMPDIR/buildhistory need to move it to new location first (in order to save history) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-03archive-*-source.bbclass: have do_dumpdata_create_diff_gz task run before ↵Laurentiu Palcu3
do_rootfs do_rootfs[cleandirs] contains ${S} and, if do_rootfs task starts before the do_dumpdata_create_diff_gz is finished, an error will occur in the process because the directory will be removed while still needed by the create_diff_gz() function. This patch will force the do_dumpdata_create_diff_gz task to run before do_rootfs when the final image is created. [YOCTO #4310] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-03image_types: fix default location of kernel when generating elf imagesTomas Frydrych1
Generation of elf images fails because kernel images are no longer staged under ${STAGING_DIR_HOST}/kernel, but rather ${STAGING_DIR_HOST}/usr/src/kernel. This patch fixes the path to point to the correct location. Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-03image.bbclass: Don't mark do_rootfs and do_build as nostampPhil Blundell1
When image.bbclass was first conceived (as rootfs_ipk.bbclass), oemake was unable to figure out when the inputs to do_rootfs had changed in such a way that it would need to be rerun. Absent any reliable information of this kind, it was necessary to adopt the conservative assumption that images always needed rebuilding and, to this end, do_rootfs and do_build in image recipes were marked as nostamp. (The nostamp annotation for do_build was added in oe-classic commit 80d622e0c1dbc284858e01d3eb670303a6d8cdf9 from January 2005; the exact point at which do_rootfs was made nostamp is obscure, but it predates oe-classic revision 63fad339e01d4b16105146c32a61f24460397126.) This situation persisted for the following eight years but, during that period, oemake evolved into today's sstate-enabled bitbake, oe itself gained the OEBasicHash algorithm which can reliably detect changes to the input data for do_rootfs or any other task, and OEBasicHash was made the default for oe-core in 4199efed48005a62267fa3374c33b13627d85f44 (June 2012). Given these various changes in the wider landscape, there is no longer any obvious benefit to having these two tasks marked as nostamp, and indeed having them so marked causes needless rebuilds which can be annoying. Anybody who does genuinely wish to rerun these tasks when nothing in the input has changed can run "bitbake -f", just like with any other task. So, let's remove the nostamp annotations and just let bitbake figure out when to rerun them. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-03classes/image: allow complementary package globs to be extendedPaul Eggleton1
Make it easy for the wildcard specifications for complementary package features to be extended outside of image.bbclass. For example, to add a new "foo-pkgs" item that could be added to IMAGE_FEATURES that would cause *-foo packages to be installed for all packages currently in the image, you can now use this line at the global level: COMPLEMENTARY_GLOB[foo-pkgs] = "*-foo" Implements [YOCTO #4228]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-02Make toolchain output name using SDK_VERSION instead of DISTRO_VERSION to be ↵Jessica Zhang1
consistent [yocto #2342] Signed-off-by: Jessica Zhang <jessica.zhang@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-05-01sstate.bbclass: make hard links for staging filesRobert Yang1
Make hard links for staging files instead of copy to save the disk space (3G will be saved for a core-image-sato build), and it doesn't affect much on the build time. The following directories are affected: 1) The sysroot 2) The DEPLOY_DIR 3) The pkgdata [YOCTO #4372] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-29Pass the mlprefix to postinst_intercept scriptLaurentiu Palcu3
This is needed in order to have separate multilib intercept hooks. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-29Revert "qemu.bbclass: Use the correct qemu binary in multilib cases"Laurentiu Palcu1
This reverts commit 9f5a6f89d9f4a6c7bed3b163e6eaa764d762f523. The reason for reverting this is: * qemuwrapper has now a fallback method; * when using multilib, calling qemu_target_binary from recipes would always point to the qemu binary corresponding to the machine architecture. Hence, postinstalls needing to use qemu would call the wrong qemu user emulation binary; Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-29cpan.bbclass: use '|' as sed separator for entry with pathsMarcin Juszkiewicz1
With normal toolchain it works. But fails badly when external Linaro toolchain is used. And this is why: -e "s/^\(CCFLAGS =.*\)/\1 -isystem/home/hrw/devel/canonical/aarch64/openembedded/build/linaro-tcwg/gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux//aarch64-linux-gnu/include -O2 -pipe -g -feliminate-unused-debug-types/" \ Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-29sstate: Set umask to 002 before packaging runsPhil Blundell1
Otherwise we might end up creating directories under sstate-cache with whatever random umask has been selected for the task that we're trying to package. This would be a bad thing since it might result in losing group write access for newly created dirs, and/or losing group read access for the sstate files themselves. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-28kernel-arch: Always use ld.bfd to link the kernelPhil Blundell1
The kernel's penchant for custom linker scripts means that it doesn't generally get on very well with gold. Make sure we are using the BFD linker here no matter what the distro default is set to. Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-22package.bbclass: ensure license excluded files aren't packagedChristopher Larson1
An excluded package left its files behind, which meant they could end up in another package instead, meaning we could ship GPLv3 binaries even with GPLv3 in INCOMPATIBLE_LICENSE. Skip the files belonging to the excluded packages to prevent this from occurring. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-22package.bbclass: add LICENSE_EXCLUSION to vardepsChristopher Larson1
Ensure that changes to INCOMPATIBLE_LICENSE re-run do_package for affected recipes. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
2013-04-22image.bbclass: change the logic when intercepts failLaurentiu Palcu1
Due to some issues with postinstalls that register hooks, we changed the logic a bit. Now, all postinstalls that register hooks will return successfully and only after, if hooks fail, mark the package as unpacked. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-22pixbufcache.bbclass: do not exit 1 after installing intercept hookLaurentiu Palcu1
This will allow to register, in a single postinstall, multiple hooks. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-04-22gtk-icon-cache.bbclass: do not exit 1 after installing intercept hookLaurentiu Palcu1
This will allow to register, in a single postinstall, multiple hooks. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>