When merging the xserver-xorg fix the to use RDEPENDS in
xserver-xorg-module-exa the RCONFLICTS has not been removed by
mistake. This drops the RCONFLICTS to properly fix it.
(From OE-Core rev: d83e218dc480a09befddf8b934d774519cdbacb5)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This ensures consistent build results and avoids build failures when compiler flags
change for example.
(From OE-Core rev: a5ff8396cad130f809f8f8da49bb38e6f80f923c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We're going around in circles trying to fix the sed expressions and making one case
work and others not work. This patch fixes the base configuration file so we have
non-overlapping substitutions. I've tried to significantly clean up various problems
that were occurring once and for all.
This will hopefully resolve all the issues people have been seeing with incorrect perl
paths.
(From OE-Core rev: 31ff70794ecc431431476f81c8934fff25383613)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Also supports a new altivec TUNE_FEATURE
(From OE-Core rev: 4586c24ad156773568cd38794936b8af62e862be)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make same changes for e6500 fpu as done with others
(From OE-Core rev: a39f8c19d0ea5dc92271cbe36a03d638cb806e04)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes builds which were building fine with previous versions of boost
(From OE-Core rev: 139b65affbf50c4230e344cd4d0205ef025bb7c3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It is needed in some SDKs that we ship own
version of lex/yacc for sdk host
(From OE-Core rev: 536c9e42d316efb42651fdc2eba1b8548d74329d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Similar to libaio, libcap is another dependency of ltp.
If libcap has been done populate_sysroot but rpm/ipk package is not
created, ltp will be compiled with libcap. So when install ltp to a
image, it complains that package libcap is not found.
[Yocto #2973]
(From OE-Core rev: bf5215f095e7e610508fcefe1224c9289c6c56cd)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
do_package is a machine specific task at the moment due to packagedata. This means
do_package tasks and their dependencies rerun between different machines
with various duplicate file installations. There are plans to fix this but they're
too invasive before release.
This patch relaxes the whitelist for sstate duplicate file detection to account
for this. Post-release, we re-enable stricter settings once do_package is not
machine specific.
(From OE-Core rev: c858259ce1881c6284f1fc2790c225c81e4a751e)
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>
Nothing should ever be poking files directly into the staging/sysroot
directories, it should always go through ${D}.
This patch ensures this recipe does this and hence fixes various
potential build issues such as lack of sstate tracking of files.
(From OE-Core rev: 7642143760c0157aba80cea7b427024ee097cc2c)
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>
This fix the installation of xserver-xorg-module-exa package at rootfs
using opkg. It were failing as conflicts where not working properly.
(From OE-Core rev: 8fb19876215a8c7918361e8360c4342d1a933a93)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This requires the changes to bitbake.conf that allow parsing of
license.conf.
As we should now be parsing license.conf, we can move some globals
out of license.bblcass and into the conf file.
(From OE-Core rev: 03e6a7cd27ed109a011fac09cf04412f87f31c3a)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
license.conf hasn't been being parsed. It probably should be.
(From OE-Core rev: b393b31fee3b4d42890c2bcbba09ea231c131dea)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The variable mentioned in license.conf is LICENSE_PATH. The variable
used in license.bbclass is LICENSE_DIR. Conforming to what is in
license.conf
(From OE-Core rev: c6e13d9cd26d016ab06e7447b307d413e1331aa0)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we fail a network test, a special flag is set in the SanityChekFailed
event. This helps Hob identify the network error properly and display
a special message to the user.
[YOCTO #3025]
(From OE-Core rev: 7877c4344db89237bba5f9a03342bfd9a03aebbf)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
set -e allows to exit if a command fails. We install a trap and execute
emergency_shell() when either the init script exits or when ctrl-c is
typed (say if we are stuck somewhere and we want to debug it).
(From OE-Core rev: ae5e2bd994e3f60d3803ab56e6ed34d08fbc56f0)
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- add check_bblayers_conf bitbake function which does the bblayers.conf
v4 -> v5 update if necessary (every layer should make its specific
bblayers.conf upgrades appending to the check_bblayers_conf function)
- we ask the user to re-run bitbake because we can't trigger reparsing
without being invasive
[YOCTO #3082]
(From OE-Core rev: 03ad4edace5db9c6e15ca776d06d20b7d4e42afc)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This should be no change to the previous situation unless you
explicitly have pulseaudio in DISTRO_FEATURES_BACKFILL_CONSIDERED
(currently).
(From OE-Core rev: 3d28d16042373e699fabd8576458f65d63463bb9)
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>
The version-specific .inc was shared with the xserver-xorg-lite package, but
that doesn't exist anymore.
(From OE-Core rev: 09b1bf350384722127ac9f098a72371cf27c3822)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Solution provided by Donn Seeley in bug 1443:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=1443
worked when testing with core-image-sato-sdk for qemuarm.
[YOCTO #2577]
(From OE-Core rev: 33ec4222c05c985b737e88850259218cf8336d46)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
During a from scratch build test, cogl build failed due a missing
dependency on libxdamage.
(From OE-Core rev: 959a2f6d88d8fa6874fff83b7a1f0e7d4e36b887)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit aa66ef6598c84231577d139ec7be413e73fac2b1 since
bdwgc-native fails to build after it. Anything which runs with a
sub-configure will fail after this change. It therefore needs
rethinking.
(From OE-Core rev: f95a9e2c292a1551861220270838cf1eaaba85b9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix autotools.bbclass to use relative paths for acpaths instead of
absolute ones. Since absolute paths may cause potential autoreconf
error like:
Can't exec "/bin/sh": Argument list too long ...
This error occurs while building coreutils with long TMPDIR, because
it has bunch of m4 files need to be expanded.
[YOCTO #2766]
(From OE-Core rev: aa66ef6598c84231577d139ec7be413e73fac2b1)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 38234f2e276356b1d77a87ceabc486107e336d19 tried to fix the sed
expressions by anchoring the left side of the search regexp to prevent
$prefix$prefix type expression in the perl config. For nativesdk this is
not enough. Adding anchors on both side fixes this.
(From OE-Core rev: bf84ec0fb9a4d01ea75447c2efe8e534ce975b53)
Signed-off-by: Christian Glindkamp <christian.glindkamp@taskit.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without --without-x the X11 detection would still go ahead and find the host X11
headers, which seems to cause problems at link time.
(From OE-Core rev: d35d19b6d0844daf8ca8aa059c0aa6077c2f573a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It transpires that eglibc has been setting PACKAGES_DYNAMIC = "libc6*" for
some time. However, this is bogus for at least two reasons:
1. Bitbake interprets PACKAGES_DYNAMIC as a regex, not a glob, so this will
match against any package whose name starts "libc" plus zero or more sixes.
This is particularly toxic because the nativesdk variant picks up the same
value and will, consequently, start trying to build itself at the slightest
excuse.
2. eglibc doesn't actually build any packages named "libc6<anything>", other
than the ones that are named in PACKAGES anyway, so the dynamic provider
declaration is in any case useless.
Simply deleting the line is not sufficient since then we get the default
value from bitbake.conf which causes eglibc.bb to fight with eglibc-locale.bb.
So instead we must set it to the empty string for good results.
(From OE-Core rev: 0fbb2e0c1889ee34d7f96266615e891bb44b1d10)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it doesn't make much sense with PV, because xserver-xorg-module-exa
was introduced in
http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4)
and (< 1.11.2) is not good enough
* because we don't know how many PRINC are in BSP/DISTRO layers,
then it's safer to RCONFLICTS with every older version then current
EXTENDPKGV
Also fixes whitespace to work correctly with opkg
(From OE-Core rev: ed0216d29fc4355c5220f3ad51df04a63cacb0c3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--
* I haven't really tested this with IPK, since it was changed from
RREPLACES to RCONFLICTS (because of RPM) and all my installed devices
are already upgraded
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Based on the previous commit 604d46c686d06d62d5a07b9c7f4fa170f99307d8
(Convert tab indentation in python functions into four-space), the
cml.bbclass was not converted, and in order to properly extend it
with external bbappend's it needs to be converted.
(From OE-Core rev: e4c1c37bb37e9eba635bc0a9308ab593abd299ec)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The chkdupexe utility is fairly worthless and drags perl in as a build dependency
of the whole util-linux recipe. If anybody actually wants to use this script
then we should package it separately, but for the time being let's just delete it.
(From OE-Core rev: 19dd830ff8a1b87499b9a51599265dd436214708)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The platform and platform_extra will be written to /etc/rpm/platform,
the rpm's arch has changed the "-" to "_", so the value in platform
should also be updated.
[YOCTO #3159]
(From OE-Core rev: 9880a5261ca509c69efbafa27cddd9b2b8ca08f0)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is no initial_solution.manifest in the second build when
incremental rpm image generation, since the initial solution has been
skipped. So we should check it before cat it.
[YOCTO #3128]
(From OE-Core rev: ad17fa82a481ab3c9f17a8338ebad1eb07c0f9d8)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Set LAYERVERSION and rename the collection to "core". Given changes such
as the tabs to spaces cleanup for python functions in the current
version, this allows other layers to depend on this version of OE-Core
specifically should they choose to do so, by specifying the following
in their own layer.conf:
LAYERDEPENDS_layername = "core:1"
Where layername is whatever value is being added to BBFILE_COLLECTIONS.
(This change does nothing unless a layer has LAYERDEPENDS set.)
(From OE-Core rev: 7069c7ef829f56ae6dd0dab5e583342f351274ed)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These were previously being hard-coded to "/sbin" and "/usr/lib" respectively,
resulting in unpackaged files if the configured values were something else.
(From OE-Core rev: fab44bdb346533edd4f702a83523d7c2414f74e5)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The LICENSE for ossp-uuid is MIT. As well, the LIC_FILES_CHKSUM
was missing the license text within uuid_md5.c
(From OE-Core rev: 99974820c8b12b1c1b05ab8a96f1b25b8e3888da)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For start-stop-daemon, --make-pidfile is used when starting a
program that does not create its own pid file.
atd would create its own /var/run/atd.pid, so remove this option.
(From OE-Core rev: f10d236cda704cd91e185f8dc9c3f52461e2dad1)
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The kernel boot process hangs when /proc/consoles doesn't exists, therefore
check the existence of /proc/consoles before executing pkg_postinst script.
Following is the log when /proc/consoles doesn't exist:
Running postinst /etc/rpm-postinsts/102...
cat: /proc/consoles: No such file or directory
cat: /proc/consoles: No such file or directory
cat: /proc/consoles: No such file or directory
INIT: Entering runlevel: 5
Starting OpenBSD Secure Shell server: sshd
generating ssh RSA key...
generating ssh ECDSA key...
generating ssh DSA key...
done.
Starting network benchmark server: netserver.
Starting system log daemon...0
Starting kernel log daemon...0
Stopping Bootlog daemon: bootlogd.
INIT: no more processes left in this runlevel
(From OE-Core rev: 390e7f1f0b1b21d3c0787a6272583d5829561f95)
Signed-off-by: Zhenhua Luo <b19537@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ipk_log_check uses a case-sensitive grep (which is correct) when deciding
whether there were any errors or not. But if it decides that there were, it
then uses a case-insensitive grep to display them. This results in a large
amount of irrelevant and confusing output which makes it hard to see the real
errors amongst the noise.
Suppress this by removing the unwanted -i.
(From OE-Core rev: 57dcacbd6f35ae2d6b505f044bbefad35da66959)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows BSPs for architectures with no thread support to set (for
example) "GCCTHREADS=no" without having to override all the other configure
parameters.
(From OE-Core rev: 6bb0d37529a82b953d374f2d76c2412d7cee587b)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This was added to allow detection of duplicate files being installed by sstate.
There is a much simpler way, just check if the file already exists. This
effectively uses the kernel VFS as the cache which is much more efficient.
This resolves a significant performance bottleneck (lock contention on a
single file) when running builds that are just being generated from sstate
cache files.
(From OE-Core rev: 603daf343ad3f18c8adb799e3625ae2a18d94f56)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current multilib search path code for packagedata is flawed since it
doesn't correctly handle changes in the TARGET_VENDOR/TARGET_OS that
multilib may make. This patch enhances the code to correctly build the
search paths so multilib packagedata is found correctly.
(From OE-Core rev: f50c5d36b2da9b36d56d95a7d89404509a1a3e9b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need to split this variable before using it. Otherwise a single "/"
character in the list whitelists every overlapping sysroot file which
was not the intention making the whole thing useless.
We'll start seeing warnings about overlapping files now this is working
correctly after this patch.
(From OE-Core rev: 9e31c748327e92b809330f4ad7b6aaecb2edf559)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otavio Salvador
Richard Purdie
Matthew McClintock
Khem Raj
Kang Kai
Elizabeth Flanagan
Bogdan Marinescu
Damien Lespiau
Constantin Musca
Paul Eggleton
Ross Burton
Andrei Dinu
Wenzong Fan
Christian Glindkamp
Phil Blundell
Martin Jansa
Jason Wessel
Robert Yang
Xin Ouyang
Zhenhua Luo