aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
AgeCommit message (Collapse)Author
2015-02-23rootfs_deb.bbclass: let apt-get handle postinst scriptsAndreas Oberritter
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23rootfs_deb_do_rootfs: Only install opkg hack if neededAndreas Oberritter
If update-alternatives-opkg was used, then .../opkg/alternatives already exists at this point. If not, then there's no need for a symlink. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23package_deb: Create /etc/apt/preferences.d to get rid of a warningAndreas Oberritter
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23package_deb.bbclass: implement BAD_RECOMMENDATIONSAndreas Oberritter
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23package.bbclass: Add SYSTEMD_SERVICE to list of package specific variablesAndreas Oberritter
Changes to SYSTEMD_SERVICE should change the sstate checksum. To make that happen, it needs to be listed in the list of package specific variables, therefore add it. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23kernel.bbclass: try to clean up initramfs codeAndreas Oberritter
- Allow to override symlink name, similar to kernel and modules tarball. - Don't change working directory. - Remove superflous debug output. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23[opendreambox] sstate.bbclass: don't remove shared pkgdata if PACKAGE_ARCH ↵Andreas Oberritter
changed to MACHINE_ARCH Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23update-rc.d/systemd: Remove OVERRIDES dependencyRichard Purdie
Taking run-postinsts and building for two machines which have different OVERRIDES leads to two different sets of stamps for an allarch package. We don't need to depend on OVERRIDES in these classes, the end resulting variables are good enough. We can therefore exclude the dependency and allow a single package to be generated for run-postinsts. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fdc949154e64afb41dd4db3a97be74a15963128d) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23kernel-module-split.bbclass: Allow autoloading multiple modules or modules ↵Martin Jansa
where basename != module name * new KERNEL_MODULE_AUTOLOAD syntax doesn't support modules where basename and module name don't match (usually - and _), e.g.: module_autoload_bq27x00_battery = "bq27x00-battery" * sometimes it's useful to load modules in particular order and module_autoload allowed to just list multiple modules, e.g.: module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-s3c24xx snd_soc_s3c24xx_i2s snd-soc-dfbmcs320 snd-soc-wm8753 snd-soc-neo1973-wm8753" or module_autoload_g_ether = "s3c2410_udc g_ether" restore this possibility which is useful for incorrect dependencies between modules Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e9cd8ba3dda624615b68c601eac04427d9483f14) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23kernel-module-split: Fix KERNEL_MODULE_AUTOLOAD handlingRichard Purdie
Addresses the problem: The stack trace of python calls that resulted in this exception/failure was: File: 'split_kernel_module_packages', lineno: 164, function: <module> 0160: if len(os.listdir(dir)) == 0: 0161: os.rmdir(dir) 0162: 0163: *** 0164:split_kernel_module_packages(d) 0165: File: 'split_kernel_module_packages', lineno: 150, function: split_kernel_module_packages 0146: 0147: postinst = d.getVar('pkg_postinst_modules', True) 0148: postrm = d.getVar('pkg_postrm_modules', True) 0149: *** 0150: modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION", True))) 0151: if modules: 0152: metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE', True) 0153: d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules)) 0154: File: 'package.bbclass', lineno: 148, function: do_split_packages 0144: d.setVar('pkg_postrm_' + pkg, postrm) 0145: else: 0146: d.setVar('FILES_' + pkg, oldfiles + " " + newfile) 0147: if callable(hook): *** 0148: hook(f, pkg, file_regex, output_pattern, m.group(1)) 0149: 0150: d.setVar('PACKAGES', ' '.join(packages)) 0151: return split_packages 0152: File: 'split_kernel_module_packages', lineno: 109, function: frob_metadata File "split_kernel_module_packages", line 109, in frob_metadata Exception: AttributeError: 'NoneType' object has no attribute 'split' ERROR: Function failed: split_kernel_module_packages [YOCTO #6461] [a revised version of a patch from Nitin Kamble] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f30d12b4fbfe7d6b581598efa9ceca69dcfb4294) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23kernel-module-split: Add support for KERNEL_MODULE_AUTOLOAD and ↵Richard Purdie
KERNEL_MODULE_PROBECONF The current module_autoload_* and module_conf_* variables are error both ugly and error prone. They aren't registered in the task checksums so changes to them aren't reflected in the build. This turns out to be near impossible to fix with the current variable format in any sensible way :(. This patch replace module_autoload with the list of variables in KERNEL_MODULE_AUTOLOAD which is a much simpler and usable API. An error is printed if an old style variable is encountered. It should be simple to convert to this. module_conf_* are harder to deal with since there is data associated with it, it isn't simply a flag. We need a list of variables that are set in order to be able to correctly handle the task checksum so we add KERNEL_MODULE_PROBECONF for this purpose and error if the user hasn't added a module to it when they should have. [YOCTO #5786] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 6f8b5be646be0f3e15e215907547f11d2a23d81b) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23recipe_sanity.bbclass: avoid error when running 'bitbake -e'Andreas Oberritter
Running 'bitbake -e' without further arguments causes a stack trace on stderr: | ERROR: Command execution failed: Traceback (most recent call last): | File "[...]/bitbake/lib/bb/command.py", line 99, in runAsyncCommand | commandmethod(self.cmds_async, self, options) | File "[...]/bitbake/lib/bb/command.py", line 405, in showEnvironment | command.cooker.showEnvironment(bfile) | File "[...]/bitbake/lib/bb/cooker.py", line 453, in showEnvironment | logger.plain("\npython %s () {\n%s}\n", e, data.getVar(e, envdata, 1)) | File "[...]/bitbake/lib/bb/data.py", line 89, in getVar | return d.getVar(var, exp) | File "[...]/bitbake/lib/bb/data_smart.py", line 522, in getVar | return self.getVarFlag(var, "_content", expand, noweakdefault) | File "[...]/bitbake/lib/bb/data_smart.py", line 612, in getVarFlag | value = self.expand(value, cachename) | File "[...]/bitbake/lib/bb/data_smart.py", line 350, in expand | return self.expandWithRefs(s, varname).value | File "[...]/bitbake/lib/bb/data_smart.py", line 340, in expandWithRefs | raise ExpansionError(varname, s, exc) | ExpansionError: Failure expanding variable can_delete_FILESPATH, expression was def can_delete_FILESPATH(cfgdata, d): | expected = cfgdata.get("FILESPATH") | #expected = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', True).split(':') for p in d.getVar('FILESPATHPKG', True).split(':') for o in (d.getVar('OVERRIDES', True) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" | expectedpaths = d.expand(expected) | unexpanded = d.getVar("FILESPATH", 0) | filespath = d.getVar("FILESPATH", True).split(":") | filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)] | for fp in filespath: | if not fp in expectedpaths: | # __note("Path %s in FILESPATH not in the expected paths %s" % | # (fp, expectedpaths), d) | return False | return expected != unexpanded | which triggered exception AttributeError: 'NoneType' object has no attribute 'split' Removing the commented second line in can_delete_FILESPATH() hides the error. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a84c36e0e5e8332ddc5a6c34e1f598d5cb87cee2) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23apt/package_mamager: Ensure WORKDIR is used for lists directoryRichard Purdie
The native sysroot should not be used as a store for the lists files since multiple images running at once would conflict over this. Instead redirect this to WORKDIR. This means some extra directories need to be created. Also create apt.conf.d to silence some warnings. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit dc4abfc8f99c08e0c1ac9d098ce17838d0eda028) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> (merge fixes)
2015-02-23image.bbclass: add BAD_RECOMMENDATIONS/NO_RECOMMENDATIONS rootfs vardepsJonathan Liu
Changes to BAD_RECOMMENDATIONS or NO_RECOMMENDATIONS require the rootfs for the image to be rebuilt. [YOCTO #5898] Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f271ec4748d604d956f2d011af1deb7f7e3a68f9) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23sstate: Drop 'SafeDep' code from setscene validation functionRichard Purdie
I have a feeling this code exists from the time before we had proper coverage of one sstate task by another task. At that time it was a "poor" persons version of that idea, we now have much better code internal to bitbake which handles this. Worse, this code actually breaks certain rebuild scenarios, e.g.: bitbake libtool-cross bitbake libtool-cross -c cleansstate rm tmp -rf bitbake libtool-cross would fail as binutils-cross wasn't installed from sstate. The easiest fix is to remove the obsolete/broken code. [YOCTO #5773] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit ccad07f35fb7f959e24fd50d04c7d10dd5cf20d0) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23image.bbclass: Also uninstall update-alternatives and shadow for ↵Phil Blundell
read-only-rootfs If the rootfs is read-only then we aren't going to be updating any alternatives or modifying the password file and these binaries will be redundant. In an ideal world we would be able to stop them from being installed in the first place but this is non-trivial to arrange. As a workaround in the meantime, let's just uninstall them once image construction is finished. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d41097a970e9bfa553cd4bc3c9fad4b9073d7bd5) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23image.bbclass: fix paths to run-postinstsRoss Burton
The run-postinsts script has been moved to ${sbindir}. [YOCTO #5719] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> (cherry picked from commit 2c8dc1b00c0cf83da106ef9544cd11cde7ce43a1) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23update-alternatives: We now use u-a in nativesdk so make sure the dependency ↵Richard Purdie
is present When update-alternatives was part of opkg which got built in most nativesdk scenarios, this missing dependency wasn't an issue. We now need nativesdk-opkg-utils so we need to ensure the dependency is present in nativesdk cases. This avoids build failures with the recent u-a move to opkg-utils. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7e0adf676da45e49287b7ce6478a6dbfd8fa117f) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23kernel-module-split: Remove extraneous call to depmod from module postinstPhil Blundell
During rootfs construction, image.bbclass will call depmod after all the modules are installed. There's no need to run it from the postinst when operating in offline root mode. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e8db81e4655ab7535db04aa3c8d7f9868ced6039) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23sstate: Add optimizing logic for crosssdk setscene dependenciesMing Liu
This patch mainly aims to add optimisation for crosssdk setscene dependency validating which we haven't handled in current logic, and which I think we could have as we've already implemented to native/cross, although there are albeit not many crossdk tasks, we could still get some performance enhancement. Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1094983ff87a8b745a5bc7bfe9514433ee3c4ad2) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23systemd: pass --root in prerm if running on hostRoss Burton
If a systemd image is built without a package manager then packages will be removed from an image during rootfs generation, but without passing --root the systemctl will look on the *host* system. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d01da862d10d9544f8da846b577cf955041d4c0c) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23image.bbclass: default USE_DEVFS to '1'Chen Qi
Default USE_DEVFS to "1" so that the `makedevs' command is not run at rootfs time by default. There are mainly two reasons to do so. 1. This will fix a build failure with initramfs-kexecboot-klibc-image. "makedevs: No entry for root in search list " 2. Most of our images use a filesystem over /dev. Most of the time, it's just devtmpfs. So we actually are using a filesystem over /dev. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> (cherry picked from commit f54fdd6673a136ee1cee1f3263a8a7820de43ca3) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23buildhistory.bbclass/image.bbclass: remove obsolete codesRoy Li
After 1b8e4abd2d9c0 [bitbake.conf/package: Collapse PKGDATA_DIR into a single machine specific directory], oe-pkgdata-util does not use target_suffix parameter, so do not need to loop the vendor Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> (cherry picked from commit 03c5f39b4d7dd8c81e0a130b7d5884e5af039a24) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23classes/recipes: More optimal DISTRO_FEATURES referencesRichard Purdie
Using the contains function results in more optimal sstate checksums resulting in better cache reuse as we as more consistent code. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 9c93526756e7cbbff027c88eb972f877bcb1f057)
2015-02-23chrpath: Improve crazy codeRichard Purdie
The current code is a little bit overcomplicated, deficient and also possibly broken. Issues include: a) Not maximally optisming rpaths (e.g. a lib in usr/lib might get an rpath of $ORIGIN/../../usr/lib) b) The return in the middle of the for loop look suspiciously like it might break on some binaries c) The depth function, loops of "../" prepending and so on can be replaced with a call to os.path.relpath This patch cleans up the above issues. Running binaries should result in less "../" resolutions which can't hurt performance either. [YOCTO #3989] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit feea54df6768036649ca6c57524e2a1f480ad249)
2015-02-23package_deb/package_ipk: Cleanup control file handling/racesRichard Purdie
If you Ctrl+C ppackage_write_{deb/ipk} control files can get left lying around and make it into another packaging format. This ensures we cleanup all known control files before starting packaging. We can simplify some of the globbing as a result. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7f8c728c82a17621461be2114c1afab3713a808e) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23update-rc.d.bbclass: Cleanup package scriptsJacob Kroon
* Add proper preinst script * Use -n "$D"/-z "$D" checks throughout the scripts * Only set OPT in cases where its used * Don't pass unnecessary -f to update-rc.d in postrm script * Remove outdated comment Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se> Signed-off-by: Saul Wold <sgw@linux.intel.com> (cherry picked from commit 2d9114aaf130179cb13c20c8b045c2694eca6fd9) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23update-rc.d.bbclass: Fix host/target test in postinstJacob Kroon
When running the postinst script I get a shell warning: sh: argument expected and the service is never stopped. This patch fixes the warning message and stops the service. Patch v2: Hans Beckérus pointed out that the patch is not correct. This version uses the syntax proposed by Hans. I've tested that the postinst script works correctly when run on the target, both when the init script exists and when it doesn't exist. Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7e23557835f756b22b95fa7a1926b5d1d21872c3) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23clutter: remove usage of FILESPATHPetter Mabäcker
Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. Instead FILESEXTRAPATHS should be used to extend the path. However in clutter the default paths solves the problem if we put all patches in ${BP} directory instead. Signed-off-by: Petter Mabäcker <petter@technux.se> Signed-off-by: Saul Wold <sgw@linux.intel.com> (cherry picked from commit cc41cb61707da1b4ae029de70c922802067166c2)
2015-02-23update-rcd.bbclass: fix host/target testRoss Burton
"update-rc: Stop and remove service if updating package" (oe-core d91b08) had a bug in it's implementation of a "host or target" test which always resulted in "target", so the rootfs scripts were attempting to restart daemons on the host. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2b179d90eacc58f0b217f64407782a9174362850) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23update-rc: Stop and remove service if updating packageFelipe F. Tonello
Since when updating packages packages managers do not remove the previous package, it just replaces new files and run pre/post install scripts. This causes not to update update-rc scripts if they were changed. This patch is useful in case the newer package version updated the update-rc script. Signed-off-by: Felipe F. Tonello <eu@felipetonello.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d91b08f3a27baa49ae35dc20dba1b2d76e6abd64) Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2015-02-23Revert "kernel.bbclass: add deploy link to KERNEL_IMAGETYPE"Andreas Oberritter
This reverts commit c1c8d2f3cffc540380c0a5fcdda48d64cbec333a. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
2014-11-12package.bbclass: Add CONFFILES to list of package specific variablesRichard Purdie
Changes to CONFFILES should change the sstate checksum. To make that happen, it needs to be listed in the list of package specific variables, therefore add it. (From OE-Core rev: 9db71fa03b9d5f5307b2d09e7aa89f46f622aa09) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-11classes/image: ignore modules.* changing during multilib image constructionPaul Eggleton
Since we now run depmod when building images (as the postinst that does this is now on kernel-base instead of kernel-image) it is possible to have module file differences between the two halves of the multilib image, and the code that checks for such differences detects this and fails. Whitelist this file to avoid the failure. Specifically, modules.alias, modules.dep and modules.symbol can differ along with their .bin counterparts. Related to fix for [YOCTO #5392]. (From OE-Core master rev: 0a315804bf991664c0948e3024b8e8b9e9085808) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-11classes/kernel: move module postinst commands to kernel-basePaul Eggleton
Since kernel-base is the package that contains the files that depmod needs to run, we should be running depmod from the kernel-base postinstall rather than kernel-image. Fixes [YOCTO #5392]. (From OE-Core master rev: f7d2cb383281ec8dfa90950ba04d87dd29ffc676) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-26image_types.bbclass: use 4096 instead of 8192 bytes-per-inodeRobert Yang
The image not correctly created if 'ptest-pkgs' is in IMAGE_FEATURES, this is because there is no free inode left. We can use 4096 instead of 8192 bytes-per-inode to fix the problem, and most of the distributions us 4096, such as Ubuntu, Suse, Fedora and CentOS. There are another problems: * There are error message when there is no free inode left if we run the mke2fs command manually, but they are not in log.do_rootfs. * The image generation doesn't stop when error happens because mke2fs doesn't return failed for this case. Will fix them in other threads. [YOCTO #5957] (From OE-Core master rev: 09ab3a00598d06e3a1bf871811c2ac37359c74da) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-25license.bbclass: fix copying license directories failedHongxu Jia
For each recipe, it populated license files to ${LICENSE_DIRECTORY}/${PN}, such as kernel's license dir was ${LICENSE_DIRECTORY}/kernel-3.10.17-yocto-standard; In do_rootfs task, it copied license directories from ${LICENSE_DIRECTORY}/ ${pkg}, and ${pkg} was listed in ${INSTALLED_PKGS}; We got ${INSTALLED_PKGS} by rpm query, such as the kernel were 'kernel-*', but the kernel's PN was linux-yocto, so searching ${LICENSE_DIRECTORY}/ kernel-* failed. Copied license directories from ${LICENSE_DIRECTORY}/${PN} fixed this issue. [YOCTO #5572] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-11Revert "license.bbclass: fix copying license directories failed"Richard Purdie
This reverts commit e58a1499accd74d3e6fe4f899711d4c680ebc18f. It depends on other functionality not backported to dora.
2014-02-11cpan-base: Add vardepvalue to get_perl_version functionMartin Jansa
* without this bitbake -S perf shows following error: ERROR: Bitbake's cached basehash does not match the one we just generated (/OE/oe-core/meta/recipes-kernel/perf/perf.bb.do_package)! if you run it twice, once without perl in sysroot and once with perl already built (From OE-Core master rev: f31f6a70ec24e8c9515d69c5092e15effc5e7d4d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-11binconfig: mangle ${base_libdir}Ross Burton
Some recipes are installing libraries into ${base_libdir} (typically /lib) and also use a foo-config binary to identify compile paths, for example libusb-compat. Without mangling ${base_libdir} the ${base_libdir} path is passed to the compiler, where it looks like a host path and results in compile-host-path QA errors. (From OE-Core master rev: ccd9abdccb84d713427541b6ee29a0e217360e74) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-09base.bbclass: pull in file-native for src.rpmChristopher Larson
Unpacking an src.rpm uses rpm2cpio.sh, which requires 'file'. Without this, builds of rpm on a host without 'file' installed will fail with very strange messages. (From OE-Core master rev: 97e1d84e2d1a74791ce6af88ddc27963bc0e1bec) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-26terminal.bbclass: do not export PS1Anders Darander
With a complex PS1 setup, PS1 might not have all characters correctly escaped when terminal.bbclass writes the export. This caused the run.do_terminal.PID to terminate, making it impossible to use the devshell. As the spawned shell will parse e.g. .bashrc (or whatever rc-file is being used), PS1 will be reset in the devshell. (From OE-Core master rev: a5e6926cd409140d16391c72316da00ffbfe5429) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26useradd.bbclass: add dependency on base-filesRoss Burton
Packages that use useradd.bbclass should have a dependency on base-files so that the /etc/skel directory is populated. Without this dependency base-files may or may not be installed when the postinst runs, and the skel content may or may not be copied. (From OE-Core master rev: 556368ba8a1f933a86b69be024bd0711d4bfe0a3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26multilib: Ensure we map the SYSTEMD_PACKAGES variableRoy Li
If we don't do this, systemd.bbclase will complain to unable to find multilib packages since PACKAGES is expand with mlprefix, but SYSTEMD_PACKAGES is not, like in ntp.inc: $grep PACKAGES meta-oe/meta-networking/recipes-support/ntp/ntp.inc PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils" SYSTEMD_PACKAGES = "${PN} ntpdate sntp" $ $bitbake ntp ERROR: ntpdate does not appear in package list, please add it ERROR: sntp does not appear in package list, please add it $ (From OE-Core master rev: 84f1d3252c369dff06a517baa4fd7fe274782e40) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26nativesdk.bbclass: support nativesdk to override with the PACKAGES_DYNAMIC ↵Hongxu Jia
statement While compiling nativesdk-mtools, there was failure: ... Nothing PROVIDES 'nativesdk-glibc-gconv-ibm850'. Close matches: ... This patch supports nativesdk to override with the PACKAGES_DYNAMIC statement [YOCTO #5623] (From OE-Core master rev: 315367ea9526186d5836c64867ce0cd40d9d8412) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26license.bbclass: fix copying license directories failedHongxu Jia
For each recipe, it populated license files to ${LICENSE_DIRECTORY}/${PN}, such as kernel's license dir was ${LICENSE_DIRECTORY}/kernel-3.10.17-yocto-standard; In do_rootfs task, it copied license directories from ${LICENSE_DIRECTORY}/ ${pkg}, and ${pkg} was listed in ${INSTALLED_PKGS}; We got ${INSTALLED_PKGS} by rpm query, such as the kernel were 'kernel-*', but the kernel's PN was linux-yocto, so searching ${LICENSE_DIRECTORY}/ kernel-* failed. Copied license directories from ${LICENSE_DIRECTORY}/${PN} fixed this issue. [YOCTO #5572] (From OE-Core master rev: 8968f9a3461912c8de217135f3691c86e2a58e86) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26ptest: ensure do_install_ptest_base task runs in fakeroot contextRoss Burton
As this task is installing files into $D it needs to run inside pseudo so that special permissions and owners are preserved. (From OE-Core master rev: 64f0a0bc408d8e32d5e795aeb9fffee0539f5e22) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26populate_sdk: verify executable or dynamically linked libraryyzhu1
When toolchain directory is changed to execute mode, some non-executable files or empty files are sorted. This will result in some errors. Thus when sorting executable files or dynamically linked library, additional conditions are to exclude non-executable files or empty files. (From OE-Core master rev: c9d56308bfa9ee7f4a9b22eae86390626ddc1c35) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26image.bbclass: Depend on virtual/kernel:do_deployRichard Purdie
Now that none of the packagegroups depend on virtual/kernel, we have the problem that MACHINE=qemumips bitbake core-image-minimal doesn't put a kernel into the deploy directory. This breaks many common usecases and user expectations. To avoid this, add a dependency on the kernel deploy to image do_build tasks. This should avoid any circular dependency issues but equally ensure users have their expectations met. [YOCTO #5581] (From OE-Core master rev: fe26b2379ecdbdb56acde8592bc0c2d95092a207) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Conflicts: meta/classes/image.bbclass Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2014-01-26base/gcc-common: Ensure umask setting is consistent for shared workdirRichard Purdie
gcc has cross and target components with a shared workdir. The unpack umask settings need to match for all of these. We need to use strings in each case to ensure the sstate code matches them correctly. This patch tweaks various things to ensure the change adding the unpack umask change doesn't break the compiler builds. (From OE-Core master rev: 67162438ee9c402b23c32853af9d313949eb6e4a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>