I know Martin finds something like this useful for testing sstate signatures,
this adds one to meta-selftest so we can use it from oe-selftest in the sstate
tests there too.
(From OE-Core rev: 7ed3364b7ca61b210fce5ed014ab700e24ee470b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Extend one of the sstate tests to also ensure that changing SDKMACHINE doesn't
change the target task checksums.
Also fix a typo and improve debugging by turning the diff filtering off
in all cases (if the test fails, we want to full list).
(From OE-Core rev: 24bb41f273148db023721804b98676a92f9a5f9c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Sysroot paths (which happen to contain MACHINE) should not cause the signatures
to change every time MACHINE changes so exclude this from them.
(From OE-Core rev: 5f3773e84332e9100b8739adf4831269329e0033)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changing SDKMACHINE (which changes SDK_ARCH) shouldn't cause
target task signatures to change. Exclude the dependency
on SDK_ARCH for this reason. It only affects nativesdk builds
and those already account for SDK_ARCH in the build WORKDIR paths.
(From OE-Core rev: dae7c45fac1d877203f173842d43abc4883b808b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If you build buildtools-tarball with opkg as the package manager, it
passes in an empty target packages list and fails.
This allows the code to cope with an empty package list (in sync
with the rpm backend).
(From OE-Core rev: b460afb12bb16a4b56d800c953c5f5c7da0bff84)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When getting the failures/errors/skipped lists, include the
unit test without the full path.
This issue was found on this scenario
| test_1_logrotate_setup (oeqa.runtime.logrotate.LogrotateTest) ... FAIL
| test_2_logrotate (oeqa.runtime.logrotate.LogrotateTest) ... ok
Where test_1_logrotate failed and test_2_logrotate should not have
run because
@skipUnlessPassed("test_1_logrotate_setup")
def test_2_logrotate(self):
(From OE-Core rev: 8715beff7b910209627da3726b18b7abf801b557)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the kern-tools SRCREV to import the following fix:
kgit-meta: resume after last applied patch
When the auto-resume (resume point detection) was removed from the
processing of a meta-series, it ignored the fact that a single patch
series may in fact be processed a number of times.
Two layers patching a kernel will generate two different runs on the
same branch, which always start at patch one. This will obviously
break with duplicate patches.
To avoid this, we simply track the last patch applied, and
explicitly
tell the patch scripts where to start. This gets us resume
functionality, without the overhead of resume point detection.
(From OE-Core rev: 692f1333e257556e7462b2436dd60e865869349c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 4.1 SRCREVs to integrate the following DRM backports:
a8abc111a96d drm/i915: Only wait for required lanes in vlv_wait_port_ready()
81354180432b Revert "drm/i915: Hack to tie both common lanes together on chv"
d660fc117731 drm/i915: Work around DISPLAY_PHY_CONTROL register corruption on CHV
0e797e9cb717 drm/i915: Implement chv display PHY lane stagger setup
(From OE-Core rev: 2ea7533b5d45bb459284dd1c3f81d4bcac88f882)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There are some important fixes and CVEs in 4.1.8, so we update the
SRCREVs to integrate the -stable changes.
(From OE-Core rev: 0cd10fc32fd6a3faced69ef206271c8afde17533)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As part of the axxia preempt-rt integration, the preempt-rt
branch now becomes standard/preempt-rt/base, to allow proper
branch inheritance as: standard/preempt-rt/axxia/base.
No functional changes happen to the base -rt, just the default
KBRANCH changes.
(From OE-Core rev: 5c91535baf876a3e2c4fd91be046dc3a92dc0ad2)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The gettext 0.16.1 doesn't install any m4 files to sysroot, please see
the following commit:
commit 9e10db5bdf
Author: Christopher Larson <kergoth@gmail.com>
Date: Mon Mar 17 18:10:54 2014 +0000
gettext-0.16.1: kill target m4 macros from sysroot
This is aim for using gettext-native's macros(gettext-native-0.19.4),
but when we set:
PREFERRED_VERSION_gettext = "0.16.1"
And build the recipes like pcmanfm, we would get errors when
do_configure:
configure:5164: error: possibly undefined macro: AM_NLS
This is because autotools_copy_aclocals doesn't copy the native macros
for target unless they're direct dependencies.
Add gettext-native to DEPENDS will fix the problem.
(From OE-Core rev: 48c168334bb60937653ab782026948d139603f8e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The code is creating more abstract types which is nice however it should
be using standard defines from stdint.h and not random defines to base
its own type system
(From OE-Core rev: 8eb5bd93614db57654d9d3fcc2edcf6f26f148a6)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update the NAME version tweak example patch for the
newer kernel. This moves the example to the 4.2 stable
kernel and appends -custom to the VERSION string.
(From OE-Core rev: dc26472661bdc0ed4248d7ab462a296f3c86c421)
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>
Currently the logic to check if a test failed was
to check for an exception in the thread, but some
decorators used in the syslog runtime test would
generate and handle exceptions; this will mess
with the current check logic and will dump the
host and the target as if the test failed.
This patch changes the check logic to verify if
the test that just happend is in the failure test
list and dump the host and target accordingly.
[YOCTO #8406]
(From OE-Core rev: 8b97d9320b989023c62db8246f5d8d2126c3723e)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
CWAUTOMACROSPREFIX is ${D}${prefix} which is used as the prefix
of install dir and used to replace the path placeholder in script
autogen.sh, the former is correct but not for the later, we can
fix the Makefile to use two variables for this, but I think a sed
replacement would be fine since the package has not been in
development for a long time.
(From OE-Core rev: bc4dfe74ecd8d4f233baf16325dae31972da269a)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When copying the exported tests to a remote machine ssh_target_log can
be transformed from softlink to file which will throw an error when
trying to run again.
(From OE-Core rev: 2bc7732c27e192821b9ebb76e1dfba739cf5b088)
Signed-off-by: Lucian Musat <george.l.musat@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently the output from qemu could contain control
or Unicode characters; having such characters in the
log will cause an internal server error when sending
the report to error reporting web. Control characters
can be found in the command line used to run quemu too.
This change sanitize the output from qemu and the
command line used to run qemu, this way the logs doesn't
contain control or Unicode characters and this will solve
the issue of error reporting web and generate better
logs.
The only Unicode character found in the qemu output
is the copyright symbol, it really doesn't interfer
removing Unicode characters with debugging.
[YOCTO #8225]
(From OE-Core rev: 9f25f723828d6709aad581267ccc63d2ade1ff5c)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Just like we have in oe-selftest, you can add
<filename>.<Class>.<testname> in TEST_SUITES in order to
run just that test
(From OE-Core rev: 3bf5204315fedc586fdf641583cfdb2c1a78c5c0)
Signed-off-by: Lucian Musat <george.l.musat@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Removed wic-image-minimal.bb and wic-image-minimal.wks as they're
also present in meta-selftest/recipes-test/images/
(From OE-Core rev: 5a52eaf938c75dccf10723979e97523026ecae44)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since inittab for qemu images now always tries to start getty on a
second serial device, make sure that device exists.
Otherwise the following message will be spammed:
INIT: Id "S1" respawning too fast: disabled for 5 minutes
[YOCTO #8374]
(From OE-Core rev: 988369afed85281f3ed9b2f3eeb30f5408498bb9)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If building for a BE8 ARM target, arch is "armeb" rather than
"arm", but ABI should still be "gnueabi". Otherwise gcc won't
build.
(From OE-Core rev: d2e1cf176b2a705f3e4bd4ab7c35bb1de5dc6985)
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove dependencies for test targets. Otherwise, during ptest
execution, "make" tries to rebuild those executables and fails
there.
[YOCTO #8059]
(From OE-Core rev: 0efdd2236ec7f16f99847c6c372f372f81c56869)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed when bitbake nativesdk-python-async:
DEBUG: Executing shell function do_compile
Traceback (most recent call last):
File "setup.py", line 2, in <module>
from setuptools import setup
ImportError: No module named setuptools
Replace distutils with setuptools will fix the problem.
(From OE-Core rev: 3f34288743edef8f50ed16c30df0e1430239ca1b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The runuser command fails with below error message, add proper PAM
config files to fix the problem. The config files are borrowed from
CentOS 7.0 release.
runuser: Failure setting user credentials
(From OE-Core rev: a6616f1a7b8e30428e61b6437f2f48379efc101d)
Signed-off-by: Shan Hai <shan.hai@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When not doing actual tests with testimage, like for example
exporting tests, the link to the log file was still created
although the actual log file was not existent. Fixed it by
moving the link creation part into the run() method.
(From OE-Core rev: 6950a5b1220d1ff81dae15195fe0d8e06977fec8)
Signed-off-by: Lucian Musat <george.l.musat@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently a lib32-core-image-* SDK prints an incorrect environment-setup-*
file name when installing the SDK. Instead of printing the wrong thing, list
the environment setup files present in the SDK.
As it happens this fixes the message printed with buildtools-tarball too
which someone reported to me about the same time as I finished this patch!
(From OE-Core rev: c2fa59f46bbc86985e6c8e4d5d514a07a9ade884)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Building a base image such as core-image-minimal with lsb and then
attempting to source /lib/lsb/init-functions, then using the start
_daemon function (to start a daemon, such as syslogd) fails, since
/lib/lsb/init-functions use functions (incl. "daemon()") from file
/etc/init.d/functions.lsbinitscripts, which is provided by package
lsbinitscripts.
Running daemon() then calls /usr/bin/mountpoint, which is provided
by util-linux.
So, lsbinitscripts has been added as an RDEPENDency in lsb, and in
turn util-linux has been added to lsbinitscripts.
[YOCTO #7732]
(From OE-Core rev: 4b1d302c60f07a39f1276a94d8c9bb34134186a3)
Signed-off-by: Alex Franco <alejandro.franco@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 5c0dc3e8f49621827e20f79fb6bc945c3f17315e)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This avoids a "Could not unlink" warning when extracting a /var/run
symbolic link pointing to /run from the base-files package as it is
unable to unlink the /var/run directory when it contains opkg.lock.
This also fixes an issue where /var/run is created as a directory
instead of a symbolic link to /run.
(From OE-Core rev: 76d71f6637f0cbdc61f76652c5affd41f6ab4854)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Acked-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make the extrating faster by:
* Merge the two heavy "for .. find" loops into one
* Move the commands out of for loop rather than inside, this can reduce the
forking amount.
As a result, when install:
* buildtools-nativesdk-standalone: 14s -> 7s (50% saved)
* core-image-minimal-core2-64-toolchain: 56s -> 47s (17% saved)
[YOCTO #8404]
(From OE-Core rev: a619f8e5fd8b88278d41a3d82aca5a8d03cb2907)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When looking at and trying to build a slightly customised SDK, I
realised the code could be simplified and written in a way which was
more customisable.
This patch moves various function calls into the SDK_POSTPROCESS_COMMAND
which was intended for this kind of use.
(From OE-Core rev: baa4e43a29e45df17eaa3456acc179b08d571db6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If you currently do a DISTRO_FEATURES_remove = "x11" with OE-Core, you
see failures due to dependency problems. The work in resolving this was
partially completed a while back. This adds in the markup mainly for
gtk/gtk3+ recipes and means "bitbake world" will work successfully.
Rather than code the gtk/gtk+ specific distro features into each recipe,
a shared variable is used.
(From OE-Core rev: ef967c70182eeccb59c7511d838a7ecb0b2315c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This change makes it possible to have local files (non-remote SRC_URI
files, i.e. files that are located in the "recipe space") under the
srctree even if S!=WORKDIR. The files must be placed under the
'local-files' subdirectory.
Complements the previous patch that imports local files into srctree.
[YOCTO #7602]
(From OE-Core rev: b7ab82485e4514e07ab8a76e554da27ddc92e6c0)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* extract: Copy all local source files (i.e. non-compressed/non-arcived
SRC_URI files that have file:// URI prefix) - excluding patches - to
the srctree repository. The files will be placed in a subdirectory
called 'oe-local-files'. The oe-local-files directory is not committed
to the Git repository, but, marked to be ignored by a .gitignore file.
The developer can manually add and commit the files to Git if the
changes to them need to be tracked.
Before this patch, local source files (were copied (and committed) to
the srctree repository only in some special cases (basically when
S=WORKDIR) when doing devtool-extract. For most of the packages local
files were not copied at all.
* update-recipe: This patch causes the local files to be 'synced' from
the srctree (i.e. from the 'oe-local-files' subdirectory) to the
layer. Being 'synced' means that in addition to copying modified
files over the original sources, devtool will also handle removing and
adding local source files and updating the recipe accordingly. We
don't want to create patches against the local source files but rather
update them directly. Thus, 'oe-local-file' directory is ignored in
patch generation when doing update-recipe, even if committed to Git.
This functionality is only enabled if the 'oe-local-files' directory
is present in srctree.
[YOCTO #7602]
(From OE-Core rev: a3bb5bd25b72bd1bcc156dabd0ffa2d9184bb160)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Helper function for replacing a pattern like:
target_dir = os.path.dirname(target)
bb.utils.mkdirhier(target_dir)
shutil.move(source, target)
(From OE-Core rev: c09e5b11225a673534594c3642ceead3eb5653a3)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Implement new function that handles patch file generation. The new
function also does the discovery of new, updated and deleted patches.
(From OE-Core rev: 183812e60e1dce09c77b41a5a927ab7fb6fdcf9d)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When adding multiple new patches append them to SRC_URI in correct order
so that they apply correctly.
(From OE-Core rev: 819680092c1b49c16f4ab01d135d44311a9dacca)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
New method for checking the status of the working tree of a repository.
(From OE-Core rev: 4e5eea06a77eca7311209b0b650e79e816713ab9)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In order to remove some code duplication. The method currently only
does checking of workspace dir.
(From OE-Core rev: 5d7cd3dc9e497bb3c2aba4cf2af3e3ee84dd7a2f)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Makes it possible to define which paths are included in the patches.
(From OE-Core rev: 640e57b423e5a8f0e4572eac985f87139780f247)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
By default Toaster clones layers to the same level where
poky clone is. This can look messy if a lot of layers are
used for Toaster builds.
Moving them into _toaster_clones/ subdirectory should make
directory structure looking cleaner. It also safer to isolate
toaster clones from what user might create.
(Bitbake rev: 139e851831eea682aba0f9403dcc2eea7c1b05bd)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changed naming scheme for clone directory. Used full git url and branch to
make it unique. This should fix the issue with using the same git
repository, but different protocols, e.g. git://some.git.repo and
http://some.git.repo.
[YOCTO #8101]
(Bitbake rev: a9baf856a1ef7d84a47fa6615353f5b3fdb8a73b)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
removed second 'import re' from localhostbecontroller.py
(Bitbake rev: 30a9271ffa2834d9a4ffafe5c03ef9e874460419)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
git reset --hard should be given either commit id or
origin/<ref name> to work properly. Without this fix git will
complain that origin/<commit id> does not exist.
[YOCTO #7505]
(Bitbake rev: ec05beff7d1b06e4df98199925c7102f5684f4e0)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Replaced 'git checkout <ref> && git rebase' with 'git reset --hard' as
with git checkout repository ends up with detached HEAD. Rebase makes
things even worse as it can cause conflicts. git reset --hard resets
repository to the required state in a most straightforward and
reliable way.
[YOCTO #7505]
(Bitbake rev: f3641a8422e67890410594453b8baf362c27df2b)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
git clone --single-branch works only with ref names. It fails if
commit sha1 is set in layer configuration with this error:
fatal: Remote branch <commit sha1> not found in upstream origin
Cloning repository without using --single-branch should work for
refs and commit sha1.
[YOCTO #7505]
(Bitbake rev: edac7b7533d50455baaaf05a46b7ace49bb24b95)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Prevent edit_bblayers_conf() from adding layer(s) multiple times. This
happened when BBLAYERS variable was "listed" multiple times in
bblayer.conf - i.e. the configuration was split into multiple separate
assignments.
[YOCTO #8316]
(Bitbake rev: 5e423237f9f4ff7e7e03bf066b0142ba4bd82219)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie
Leonardo Sandoval
Bruce Ashfield
Robert Yang
Khem Raj
Saul Wold
Mariano Lopez
Jackie Huang
Lucian Musat
Ed Bartosh
Randy Witt
Peter Seebach
Maxin B. John
Chen Qi
Daniel Istrate
Alex Franco
Jonathan Liu
Markus Lehtonen