summaryrefslogtreecommitdiffstats
path: root/meta/classes/native.bbclass
Commit message (Collapse)AuthorAgeFilesLines
* classes/native: Propagate dependencies to outhashJoshua Watt2022-01-171-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Native task outputs are directly run on the build system during the build after being built. Even if the output of a native recipe doesn't change, a change in one of its dependencies may cause a change in the output it generates (e.g. rpm output depends on the output of its dependent zstd library). This can cause poor interactions with hash equivalence, since this recipe's output-changing dependency is "hidden" and downstream tasks only see that this recipe has the same outhash and therefore is equivalent. This can result in different output in different cases and issues with reproducible builds in parcular (e.g. rpm compression changes for the same content). To resolve this, unhide the output-changing dependency by adding it's unihash to this tasks outhash calculation. Unfortunately, we don't know specifically know which dependencies are output-changing, so we have to add all of them. [YOCTO #14685] (From OE-Core rev: d6c7b9f4f0e61fa6546d3644e27abe3e96f597e2) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Manual override fixesRichard Purdie2021-08-021-1/+1
| | | | | | | | | | The automated conversion of OE-Core to use the new override sytax isn't perfect. This patches some mis-converted lines and some lines which were missed by the automation. (From OE-Core rev: 4e9a06b64b43131b731fb59a0305f78a98e27fbd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert to new override syntaxRichard Purdie2021-08-021-2/+2
| | | | | | | | | | | | This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: Do not remove "-native" in the middle of recipe namesPeter Kjellerstedt2021-06-011-2/+6
| | | | | | | | | | | | | | | | | | | | For dependencies such as "${PN}-foo", when modifying them for native recipes, it is expected that they become "${BPN}-foo-native" rather than "${BPN}-native-foo-native". This was previously done by removing all occurences of "-native" from the dependency before adding "-native" at the end. However, this fails for a recipe such as "crate-native-tls" that happens to contain the string "-native" in the middle of the name. Solve this by simply replacing ${PN} with ${BPN} in the name instead before adding "-native" at the end Also simplify adding "-native" to the end of names the recipe provides. In this case it is not necessary to replace ${PN} with ${BPN} as the recipes are expected to use ${BPN}-foo in the first place. (From OE-Core rev: edaf8ff278fc96b122c4fc3266b63856e3350f4c) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native: Stop clearing PACKAGESRichard Purdie2021-01-291-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Native recipes have been special and they don't have packages generated from them. The RDEPENDS/RPROVIDES and other runtime package specific variables can contain important data about dependencies recipes need though and currently it is required to write this information explicitly in the native case. We now delete the packaging tasks for native recipes which removes the need to clear PACKAGES. The next step to improve the metadata is to stop clearing it and ensure any entries in these variables are remapped appropriately. The R* variables were already being processed by the class extension code but the implementation was suboptimal. This patch stops clearing PACKAGES and PACKAGES_DYNAMIC and fixes the places where that caused issues in OE-Core, for example PACKAGES additions in anonymous python without the "-native" suffix and a case where the included classes caused a self reference in DEPENDS which would once have been removed by the previous code. The implementation uses datastore/parser parameters to ensure that the variable overrides are not overwritten when calling setVar which is appropriate for a function as close to the core as this one is. Some now unneeded code in python3-setuptools is dropped, there are further changes like this which can follow. This change was verified with OE-Core by comparing task-depends.dot generated by "bitbake world -g" before and after the change, the files were identical. (From OE-Core rev: fd6a007efa7cb45101a66f294af81d9d33bb3fab) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native/cross/nativesdk: Drop obsolete do_populate_sysroot[stamp-extra-info]Richard Purdie2020-01-271-1/+0
| | | | | | | | | With recipe specific sysroot, these settings do nothing. Drop the obsolete code. (From OE-Core rev: 6269f1935f5fd2d9397045566f2e0e4fc0df85cb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu-helper-native/systemtap-native: Ensure sysroots are populated with ↵Richard Purdie2019-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | dependencies As Alex Kanavin found, dependencies aren't always populated, particularly with the hash equivalence server enabled locally: 'bitbake core-image-minimal' with gtk+ disabled. can confirm with: $ tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -display gtk qemu-system-x86_64: Display 'gtk' is not available. Enable gtk in local.conf with: PACKAGECONFIG_append_pn-qemu-system-native = " gtk+" 'bitbake core-image-minimal', without deleting tmp/ $ tmp/work/x86_64-linux/qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/qemu-system-x86_64 -display gtk qemu-system-x86_64: Display 'gtk' is not available. This change ensures the dependencies are correctly handled as the full sysroot is always depended upon even if things come from sstate. (From OE-Core rev: d40853b10dd9f01d6a8dd4edcb941cfa8a544922) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cpio/tar/native.bbclass: move rmt to sbindir and add a prefix to avoid ↵Hongxu Jia2019-05-081-0/+1
| | | | | | | | | | | | | | | | | | native clashing The rmt in cpio-native and tar-native is clashing, since tar-native has set var-NATIVE_PACKAGE_PATH_SUFFIX, we move rmt to sbindir, and add suffix NATIVE_PACKAGE_PATH_SUFFIX to sbindir could avoid the clashing. And in Ubuntu, rmt is in sbindir $ which rmt /usr/sbin/rmt (From OE-Core rev: e9ac5ac2f4d135734f549d17cce3ebc52132b7d0) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native: Enable RDEPENDS handlingRichard Purdie2019-02-171-0/+3
| | | | | | | | | | | | | | | | Native recipes don't currently honour their RDEPENDS. In the case of some python scripts this has started causing problems since whilst they're not needed at build time (DEPENDS), they are needed at runtime. We put off making this change due to circular dependency issues. I believe the three such problems in OE-Core are now fixed, as is the dependency loop identfication code in bitbake so its time to improve this situation. [YOCTO #10113] (From OE-Core rev: c62520b63284927e177831c351fafa4d2768cb1f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass/cross.bbclass: No strip sysroot when DEBUG_BUILDRobert Yang2019-01-261-0/+3
| | | | | | | | | | This makes dbg work for native tools, and makes debug native tools problem easier, otherwise, there is no symbol since trippped. (From OE-Core rev: 1d903485da26fec991b4a940182e32934220e19b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf: drop _build-${BUILD_OS} over-rideAndre McCurdy2018-05-221-1/+0
| | | | | | | | | | | | | Building on a host OS other than a recent version of Linux is not recommended or supported. Drop the historical _build-${BUILD_OS} over-ride to avoid giving the impression that other host OS's might be supported. (From OE-Core rev: 428fc39356cb77830de9e0d3f1dbd00f5868290a) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: drop _virtclass-native and _virtclass-nativesdk overridesAndre McCurdy2018-05-151-2/+0
| | | | | | | | | | | | | | | | The _virtclass-XXX over-rides are problematic in that they are higher priority than _forcevariable, which is documented as being the highest priority over-ride. Since they are now obsolete (replaced by _class-native and _class-nativesdk) drop them entirely rather than try to fix their priority. (From OE-Core rev: c5aa33ac483618bc23fbaccb0a18853186f9155d) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native bbclass: handle base_libdir as wellKoen Kooi2018-05-041-0/+2
| | | | | | | | | | Native.bbclass needs to fixup both base_libdir and libdir to handle things like multiarch. This fixes wic and ext4.* image failures during do_rootfs where mkfs.ext4 can't find its libraries. (From OE-Core rev: 464dad0dc93aeeedd34d90c2f06596060ec135fd) Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native/cross: remove redundant DEPENDS_GETTEXT assignmentRoss Burton2018-01-111-2/+0
| | | | | | | | | | DEPENDS_GETTEXT defaults to gettext-native, so there's no need to set it again in these classes. (From OE-Core rev: 5e4b1915e7a5a94d410c5292b5ed2f447c82b18a) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Drop further remnants of uclibc supportRichard Purdie2017-06-221-1/+1
| | | | | | | | | | | | | | uclibc support was removed a while ago and musl works much better. Start to remove the various overrides and patches related to uclibc which are no longer needed. uclibc support in a layer would still be possible. I have strong reasons to believe nobody is still using uclibc since patches are missing and I doubt the metadata even parses anymore. (From OE-Core rev: ec03023d2165b49a52b83bac1ea2f0bfded7b852) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native/nativesdk: Ensure DISTRO_FEATURES is determisticRichard Purdie2017-06-121-1/+1
| | | | | | | | | | | | set() order is random and hence the filtered native/nativesdk DISTRO_FEATURES could be set to random ordering. We've been lucky so far this tended not to cause issues but some queued changes highedlighted this. Thrown in a sorted() so the order is deterministic and we get consistent hash checksums between runs and between machines. (From OE-Core rev: 76391673754cf6a01d68eedbd4181e543fa2f427) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf: Add COMPONENTS_DIR for ${STAGING_DIR}-componentsPeter Kjellerstedt2017-05-111-1/+1
| | | | | | | | | | The path to where to install and find the sysroot components is used in many places. This warrants it to get its own variable. (From OE-Core rev: 70a84b525470f72339568409daf84845904e4cab) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native/nativesdk: Use fixed DISTRO_FEATURESJussi Kukkonen2017-04-121-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be little advantage to letting distro features affect native builds. There is a significant disadvantage: a change to DISTRO_FEATURES will trigger a lot of unnecessary native tasks. In a test like this: $ bitbake core-image-minimal # append " systemd" to DISTRO_FEATURES $ bitbake core-image-minimal The latter build takes 44 minutes (28%) of cpu-time less with this patch (skipping 135 native tasks). Sadly wall clock time was not affected as glibc remains the bottleneck. Set native distro features to DISTRO_FEATURES_NATIVE appended with an intersection of DISTRO_FEATURES and DISTRO_FEATURES_FILTER_NATIVE. Current default values (baitbake.conf) are * DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation" (as gtk-doc-native has much less dependencies when built without it) * DISTRO_FEATURES_NATIVE ?= "x11" (to enable native UIs even if target does not containe them) Do the variable setting in native_virtclass_handler() because otherwise it could still be overridden by appends and the feature backfilling. Shuffle the early returns so DISTRO_FEATURES gets set as long as the packagename ends with "-native". Add similar variables for nativesdk. To make nativesdk work we need to enable the locale options so nativesdk-glibc-locales can build and to avoid the init manager check in the nativesdk case so add those fixes. (From OE-Core rev: 731744d5538e315702be828e6f2bd556309dee07) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: clear MACHINE_FEATURESAndre McCurdy2017-03-241-0/+1
| | | | | | | | | | | | | Try to avoid native recipes accidentally being dependent on MACHINE_FEATURES. This simple change doesn't prevent MACHINE_FEATURES set via MACHINE_FEATURES_BACKFILL sneaking through, but it's better than nothing. (From OE-Core rev: 96c20c9df714cdf3f0e9461ec566c4f5d3bdb5f1) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: populate native recipe with it's filesSaul Wold2017-02-231-0/+5
| | | | | | | | | | | | | | This allows a native package's recipe-sysroot-native to be populated with that packages native image files. This in turns allows it to be used by scripts or other tools without creating un-necessary DEPENDS. An example of this is systemtap-native and the crosstap script. (From OE-Core rev: 7f6b4359e1f2d9d748d23305a2af73c0efba5928) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate: Make SSTATE_SCAN_CMD vars configurable using weak defaults.Kristian Amlie2017-01-311-0/+4
| | | | | | | | | | | | | | | For this we move them out of the python section so they can be overridden on a per-recipe basis. The motivation for this change is that not all tool chains need the path modifications provided by the command, and these will provide alternative or empty commands. The Go compiler is such an example. (From OE-Core rev: 7d2a2160336413736dd4640f5b84ba4d74bb00f5) Signed-off-by: Kristian Amlie <kristian.amlie@mender.io> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Switch to Recipe Specific SysrootsRichard Purdie2017-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is comparatively large and invasive. It does only do one thing, switching the system to build using recipe specific sysroots and where changes could be isolated from it, that has been done. With the current single sysroot approach, its possible for software to find things which aren't in their dependencies. This leads to a determinism problem and is a growing issue in several of the market segments where OE makes sense. The way to solve this problem for OE is to have seperate sysroots for each recipe and these will only contain the dependencies for that recipe. Its worth noting that this is not task specific sysroots and that OE's dependencies do vary enormously by task. This did result in some implementation challenges. There is nothing stopping the implementation of task specific sysroots at some later point based on this work but that as deemed a bridge too far right now. Implementation details: * Rather than installing the sysroot artefacts into a combined sysroots, they are now placed in TMPDIR/sysroot-components/PACKAGE_ARCH/PN. * WORKDIR/recipe-sysroot and WORKDIR/recipe-sysroot-native are built by hardlinking in files from the sysroot-component trees. These new directories are known as RECIPE_SYSROOT and RECIPE_SYSROOT_NATIVE. * This construction is primarily done by a new do_prepare_recipe_sysroot task which runs before do_configure and consists of a call to the extend_recipe_sysroot function. * Other tasks need things in the sysroot before/after this, e.g. do_patch needs quilt-native and do_package_write_deb needs dpkg-native. The code therefore inspects the dependencies for each task and adds extend_recipe_sysroot as a prefunc if it has populate_sysroot dependencies. * We have to do a search/replace 'fixme' operation on the files installed into the sysroot to change hardcoded paths into the correct ones. We create a fixmepath file in the component directory which lists the files which need this operation. * Some files have "postinstall" commands which need to run against them, e.g. gdk-pixbuf each time a new loader is added. These are handled by adding files in bindir with the name prefixed by "postinst-" and are run in each sysroot as its created if they're present. This did mean most sstate postinstalls have to be rewritten but there shouldn't be many of them. * Since a recipe can have multiple tasks and these tasks can run against each other at the same time we have to have a lock when we perform write operations against the sysroot. We also have to maintain manifests of what we install against a task checksum of the dependency. If the checksum changes, we remove its files and then add the new ones. * The autotools logic for filtering the view of m4 files is no longer needed (and was the model for the way extend_recipe_sysroot works). * For autotools, we used to build a combined m4 macros directory which had both the native and target m4 files. We can no longer do this so we use the target sysroot as the default and add the native sysroot as an extra backup include path. If we don't do this, we'd have to build target pkg-config before we could built anything using pkg-config for example (ditto gettext). Such dependencies would be painful so we haven't required that. * PKDDATA_DIR was moved out the sysroot and works as before using sstate to build a hybrid copy for each machine. The paths therefore changed, the behaviour did not. * The ccache class had to be reworked to function with rss. * The TCBOOTSTRAP sysroot for compiler bootstrap is no longer needed but the -initial data does have to be filtered out from the main recipe sysroots. Putting "-initial" in a normal recipe name therefore remains a bad idea. * The logic in insane needed tweaks to deal with the new path layout, as did the debug source file extraction code in package.bbclass. * The logic in sstate.bbclass had to be rewritten since it previously only performed search and replace on extracted sstate and we now need this to happen even if the compiled path was "correct". This in theory could cause a mild performance issue but since the sysroot data was the main data that needed this and we'd have to do it there regardless with rss, I've opted just to change the way the class for everything. The built output used to build the sstate output is now retained and installed rather than deleted. * The search and replace logic used in sstate objects also seemed weak/incorrect and didn't hold up against testing. This has been rewritten too. There are some assumptions made about paths, we save the 'proper' search and replace operations to fixmepath.cmd but then ignore this. What is here works but is a little hardcoded and an area for future improvement. * In order to work with eSDK we need a way to build something that looks like the old style sysroot. "bitbake build-sysroots" will construct such a sysroot based on everything in the components directory that matches the current MACHINE. It will allow transition of external tools and can built target or native variants or both. It also supports a clean task. I'd suggest not relying on this for anything other than transitional purposes though. To see XXX in that sysroot, you'd have to have built that in a previous bitbake invocation. * pseudo is run out of its components directory. This is fine as its statically linked. * The hacks for wayland to see allarch dependencies in the multilib case are no longer needed and can be dropped. * wic needed more extensive changes to work with rss and the fixes are in a separate commit series * Various oe-selftest tweaks were needed since tests did assume the location to binaries and the combined sysroot in several cases. * Most missing dependencies this work found have been sent out as separate patches as they were found but a few tweaks are still included here. * A late addition is that extend_recipe_sysroot became multilib aware and able to populate multilib sysroots. I had hoped not to have to add that complexity but the meta-environment recipe forced my hand. That implementation can probably be neater but this is on the list of things to cleanup later at this point. In summary, the impact people will likely see after this change: * Recipes may fail with missing dependencies, particularly native tools like gettext-native, glib-2.0-native and libxml2.0-native. Some hosts have these installed and will mask these errors * Any recipe/class using SSTATEPOSTINSTFUNCS will need that code rewriting into a postinst * There was a separate patch series dealing with roots postinst native dependency issues. Any postinst which expects native tools at rootfs time will need to mark that dependency with PACKAGE_WRITE_DEPS. There could well be other issues. This has been tested repeatedly against our autobuilders and oe-selftest and issues found have been fixed. We believe at least OE-Core is in good shape but that doesn't mean we've found all the issues. Also, the logging is a bit chatty at the moment. It does help if something goes wrong and goes to the task logfiles, not the console so I've intentionally left this like that for now. We can turn it down easily enough in due course. (From OE-Core rev: 809746f56df4b91af014bf6a3f28997d6698ac78) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: remove True option to getVar callsJoshua Lock2016-12-161-5/+5
| | | | | | | | | | | | | getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/native: set lt_cv_sys_lib_dlsearch_path_specRoss Burton2016-10-041-2/+1
| | | | | | | | | | | | This variable is used by libtool to know what paths are on the default loader search path. As we have modified loader paths, native.bbclass can tell libtool that both the sysroot libdir and the host library paths are searched, so no RPATHs for those will be generated. (From OE-Core rev: 2d0a1b029447842a6f97f72ae636c9020c4206a9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf/native/nativesdk: Set PKG_CONFIG_SYSTEM_ at top levelRichard Purdie2016-02-061-0/+2
| | | | | | | | | | | | | | Setting PKG_CONFIG_SYSTEM_{HEADERS/INCLUDE}_PATH for nativesdk isn't enough, we also need to deal with multlib cases where libdir from pkg-config-native isn't correct. Native builds are about the only case where this variable shouldn't be set. Therefore move the code from nativesdk to bitbake.conf and unexport it in the native case. (From OE-Core rev: 46c48c26ab1916e2dfb841d74a0f2a58d8b2b870) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: Set CXXFLAGS from BUILD_CXXFLAGS not BUILD_CFLAGSPhil Blundell2016-01-311-1/+1
| | | | | | | | | | | Although BUILD_CXXFLAGS, by default, expands to the same thing as BUILD_CFLAGS there is no guarantee that this will be true in all cases. When setting CXXFLAGS we should use the former. (From OE-Core rev: fd75637d97cc3d669229e59c1d21ce7038fc92d7) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nopackages: Add class for recipes which don't generate packagesRichard Purdie2015-12-141-7/+1
| | | | | | | | | | | | | | | | It turns out writing the same list of packaging tasks multiple times in multiple places is error prone. Move this to a new class 'nopackages", migrate existing users and add glibc-initial and libgcc-initial since we don't want packages for those recipes. This means the sstate for those recipes won't be installed, saving small amounts of build time and bandwidth. A reference to the old package_write task is also dropped. (From OE-Core rev: cece583d58f82a50c3a4eac876eb326ac3b8f5e5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native: Move virtclass override to earlier so DEPENDS is handled correctlyRichard Purdie2015-07-211-1/+3
| | | | | | | | | | | | | Currently the virtclass override is added too late to be taken into account when DEPENDS and other variables are processed by the virtclass extension code. This sets the overrides in a more optimal place, meaning they are accounted for in variables like DEPENDS. Recipes in meta-oe like libwmf-native showed the issue. (From OE-Core rev: e9bfd0583d7796cb9f71ff8762650e057103e3d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native: Improve PROVIDES handlingRichard Purdie2015-05-261-2/+4
| | | | | | | | | | | | | Since this class works on pre finalised data, the logic hasn't needed to be exact. If we change the way the finalised data works, we find that certain dependencies can be dropped (e.g. pn isn't in the name). To fix this, restructure the function to alter each entry in turn and not drop any entries. (From OE-Core rev: 4434977ccb95f8f366ba133366093b8c7ef1f718) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: avoid unintended substring replacement when setting PROVIDESMario Domenech Goulart2015-05-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The way native_virtclass_handler was implemented leaded to unintended substring replacements when setting PROVIDES for native providers, in case the original PROVIDES value contains providees with common substrings. Here's a practical case where the old behavior was problematic: the oracle-jse-jdk-x86-64 recipe provides both virtual/java and virtual/javac: Before: $ bitbake -e oracle-jse-jdk-x86-64-native | grep ^PROVIDES= PROVIDES="oracle-jse-jdk-x86-64-native virtual/java-native virtual/java-nativec" After: $ bitbake -e oracle-jse-jdk-x86-64-native | grep ^PROVIDES= PROVIDES="oracle-jse-jdk-x86-64-native virtual/java-native virtual/javac-native" Change-Id: I8186992dae58e37c2a2364586360ff9b7da9198f (From OE-Core rev: c28291f1fb07fbc80275d9bceefed642c963e204) Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native: remove PN from DEPENDS automaticallyRoss Burton2015-02-031-1/+3
| | | | | | | | | | | | | | | If a recipe (say, wayland) has DEPENDS=wayland-native and BBCLASSEXTEND=native, when built as wayland-native it has DEPENDS=wayland-native which results in a circular dependency. Typically this is resolved by having explicit DEPENDS_class-native statements but as this is duplication which can lead to inconsistent dependencies, automatically remove the circular dependency. (From OE-Core rev: 3e9392c0965166462e0993d46f4cc2fb1832f1e5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: use BUILD_* variablesRoss Burton2014-10-241-10/+11
| | | | | | | | | | | | | | Instead of replicating the logic for the host compiler naming from bitbake.conf, use the BUILD_* variables directly. Also change BUILD_CPP to use gcc -E (which native.bbclass previously used), as some recipes (e.g. grub-efi) use ${CPP} with multiple input files, which gcc -E can handle but cpp can't. (From OE-Core rev: 9237d18964ff0bf76f5c37fca21ab3974d81d0d2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: deltask package_qaRobert Yang2014-09-011-0/+1
| | | | | | | | | | | | | The native recipe doesn't need package_qa, and it has a race issue with do_unpack which requires the clean dir of ${S}, then causes error: NOTE: recipe opkg-utils-native-0.1.8+gitAUTOINC+eae0d8fa44-r0: task do_package_qa: Failed ERROR: Task 283 (virtual:native:/path/to/opkg-utils_git.bb, do_package_qa) failed with exit code '1' (From OE-Core rev: 6ad0979a6064755fd6d86b568bd3cbbcdd3d4e37) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native/nativesdk: Clear MACHINEOVERRIDESKhem Raj2014-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | In cases where we override variables e.g PACKAGE_ARCH conditionally and use a MACHINEOVERRIDE to qualify the override like PACKAGE_ARCH_<MACHINE> = "some target PACKAGE_ARCH" This would also be effective if this recipe is BBEXTENDED to native or nativesdk which is undesired This particular issue will cause wrong sysroot to be used for nativesdk case since PACKAGE_ARCH would have been modified and eventually changing value of STAGING_DIR_TARGET which we use as --sysroot option to cross and cross-canadian built SDK gcc (From OE-Core rev: 6907da7eb44dca812dbb9e214357ee96e9ff738a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: Properly define directoriesMatthieu Crapet2014-06-141-1/+6
| | | | | | | | | | | | | | | | | | For most users this commit will have no effect. But if you come across the idea of giving different names for paths, you'll get some troubles. When a recipe inherit native, properly define bindir, sbindir, includedir, sysconfdir, datadir (using xxxdir_native definitions from meta/conf/bitbake.conf). For example, edit "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/quilt-native/temp/log.do_configure" and see what are the arguments given by oe_runconf. Notice that ${docdir}, ${mandir}, ${infodir}, ${localstatedir} have no associated _native definition. (From OE-Core rev: 15345ddd4be6a0b041b3d6caaad48d46b22142e9) Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/lib/oe: Fix cross/crosssdk referencesRichard Purdie2014-05-111-1/+1
| | | | | | | | | | | | | | | | With the renaming of the cross packages, its no longer possible to use endswith("-cross") and similar to detect cross packages. Replace these references with other techniques. This resolves certain build from sstate failures which were due to the system believing cross packages were target packages and therefore dependency handling was altered. (From OE-Core rev: 91edf4cac223298e50a4b8e59dd19f1b272e3418) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: Override TARGET_ flags tooMike Crowe2014-04-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | TARGET_LDFLAGS is currently defined in bitbake.conf to contain ${TARGET_LINK_HASH_STYLE} which differs between MIPS and other targets. Since TARGET_LDFLAGS is an exported variable it affects the hash of every shell task even if it is not used. We don't want native recipe tasks to have different hashes purely because they happen to have been built in order to satisfy dependencies for different MACHINEs since this causes lots of churn in the native sysroot when switching between MACHINEs. Making native.bbclass override TARGET_LDFLAGS to use BUILD_LDFLAGS ensures consistent hashes and is a sensible thing to be doing anyway. Although they don't appear to have the same detrimental affect on task hashes TARGET_CPPFLAGS, TARGET_CFLAGS and TARGET_CXXFLAGS should be overridden too. (From OE-Core rev: 05a70ac30b37cab0952f1b9df501993a9dec70da) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native: Use deltask to remove tasks which have no purposeRichard Purdie2013-12-201-5/+6
| | | | | | | | | | | | core-image-sato has 47703 inter task dependencies before this patch and 29883 afterwards which is a significant worthwhile task graph simplification. (From OE-Core rev: ac4b1518ec549b5a4d7a79c60dbf96b90797e1d8) (From OE-Core rev: 8f4f229ba8117ba411a858bf47f88a370bb70491) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf/native.bbclass: Use FC instead of F77 for fortranRichard Purdie2013-12-051-1/+1
| | | | | | | | | | | | | gcc tooling appears to be standardising around the FC variable naming. This patch changes the F77 namespace to FC instead and use the default gfortran compiler. If anyone needs the F77 variables or tools, those can still be made on a case by case basis. Also updates local.conf.sample.extended accordingly. (From OE-Core rev: ae8c17be2845eff2be8394a5d9a45e6aa321c33d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cross/crosssdl/native/nativesdk: Fix do_packagedata stampsRichard Purdie2013-10-041-0/+1
| | | | | | | | | | | | | If you build nativesdk for machine A, then change to B you will see sstate manifest warnings for the packagedata files. The stamps are machine specific and should not be, ditto for native. This patch copies the populate-sysroot extra stamp entries to avoid these warnings. (From OE-Core rev: a64de25d6006ec6dd777d8f3820a48244dfbf62b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native: Use a native site file and ensure the correct sed is usedRichard Purdie2013-09-301-1/+1
| | | | | | | | | | | | | | | | native recipes were not using the site files. There are some things we need to correct such as not using the path to sed-native. This allows us to deploy settings globally for all recipes rather than hacking around then in individual recipes as libtool-native used to for sed. This fixes a regression introduced by http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=32edeb391f2107bb66b361cdcd4b8d4447731c33 (From OE-Core rev: db2eb3258844458569b7d4e6ed82c345858a3b99) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gettext: Improve USE_NLS handling for nativesdk/crosssdk/cross-canadianRichard Purdie2013-08-231-0/+2
| | | | | | | | | | | | | | | | The gettext handling of USE_NLS has become a bit tricky to understand, or alter from the SDK context. This patch introduces a SDKUSE_NLS which can be set to configure a given SDK/ADT to use NLS or not. This is independent of the target system NLS usage. The code in gettext.bbclass is therefore simplified and the classes themselves now set USE_NLS to appropriate values. No NLS is used for native, cross and crosssdk since it is never used there and would just increase build time. (From OE-Core rev: fe634d47449899f7424adb77ff5bc7ddf8a07a47) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/conf: Add eventmasks for event handlersRichard Purdie2013-06-141-3/+1
| | | | | | | | | | | Now that bitbake supports masking events for event handlers, lets use this so event handlers are only called for events they care about. This lets us simplify the code indentation a bit at least as well as mildly improving the event handling performance. (From OE-Core rev: bff73743280f9eafebe4591f7368ead91a4eb74d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ptest bug fixesBjörn Stenberg2013-04-111-0/+3
| | | | | | | | | | | | | | | | | | | Move ${PN}-ptest to start of PACKAGES to ensure all ptest files are packaged in the -ptest package. Add QA exclusions to insane.bbclass to ensure -ptest packages can contain any files they need. Disable ptest for native packages. Don't emit errors on missing _ptest functions. (From OE-Core rev: 01bea4ef932e46eb2fcc8b4be7ff5e2b5b2a0978) Signed-off-by: Björn Stenberg <bjst@enea.com> Signed-off-by: Anders Roxell <anders.roxell@enea.com> Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Split do_packagedata task from do_packageRichard Purdie2013-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Currently, do_rootfs has a dependency on all the do_package output being present due to its usage of the pkgdata directories. This means that if you run: bitbake xxxx-image -c rootfs you end up having to fetch and unpack all the do_package data which is usually large and inefficient. It also means rm_work has to leave all the do_package data lying around so rootfs works. This patch splits the actual creation of the pkgdata directory off into a separate task, "packagedata" which happens immediately after do_package. We can then remap the dependencies so this task is depended upon, not do_package. Sstate can then be programmed not to require do_package at the appropriate times. Whilst this patch doesn't do so, it opens the possibility of rm_work wiping out the do_package output from WORKDIR as long as it also removed the do_package stamp (both normal and setscene variants) and allowing more space savings with rm_work which has been regularly requested. (From OE-Core rev: 6107ee294afde395e39d084c33e8e94013c625a9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: Drop do_package stamp-extra-infoRichard Purdie2012-11-211-1/+0
| | | | | | | | | This was needed when do_package for target recipes was target specific however since it now isn't we can remove these stale references. (From OE-Core rev: 1c54d8c3639659bc8cf8fa2786a1aa9ed785b723) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: Be consistent about sstate-inputdirs/outputdirs ending with '/'Richard Purdie2012-11-141-2/+2
| | | | | | | | | | | If sstate-inputdirs and sstate-outputdirs don't match with ending '/' characters, the manifest file can end up corrupted. This change ensures the metadata is consistent in ending do_populate_root tasks with this character to avoid manifest file corruption. (From OE-Core rev: 3910eaf88d14904eef85b9e391387547df7fc54e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: replace virtclass-native(sdk) with class-native(sdk)Robert Yang2012-11-021-3/+3
| | | | | | | | | | | | | The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] (From OE-Core rev: 9fbeab63315fef0dbcc91c5e7051665764758a6e) 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.bbclass: Switch shlibs to pkgdata directory and make package ↵Richard Purdie2012-10-221-1/+0
| | | | | | | | | | | | | | | | | non-machine specific Currently, do_package is machine specific since the shlibs data is installed into each machine specific sysroot. This change moves the shlibs data to the pkgdata structure, at the expense of having to iterate over a set of shlibs directories instead of a single one. It turns out this isn't any particular hardship for the code and as a result, do_package stops being machine specific leading to optimisations for builds that use a common PACKAGE_ARCH. (From OE-Core rev: cc088489d70fb27d460c3dbe35d6ea382123c134) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* native.bbclass: correct PATH to have native-intercept be prependedSaul Wold2012-06-281-1/+1
| | | | | | | | | | | | This was needed since it was after the sysroots and thus in some cases the native sysroot chown was being found and used instead of the script provided by native-intercept/chown. This was noticed by the non-gplv3 build since it's coreutils depends on coreutils-native. (From OE-Core rev: bb5095d3f73a00222f50f9dd2cf8dc27cc72b4a2) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>