update-rc.d doesn't just want an initscripts package, it wants
initscripts-functions. In the case where VIRTUAL-RUNTIME_initscripts is set to
nothing, update-rc.d still needs initscripts-functions to satisfy its runtime
dependencies. Further, we shouldn't be using a *runtime* virtual in a *build
time* variable. This should resolve image creation failures with
configurations without sysv initscripts when a recipe inherits update-rc.d and
doesn't inherit systemd.
(From OE-Core rev: e6642ae0849e5ac3174c643a7693af25d829d6d1)
(From OE-Core rev: 833302761df924bb503cc2ad04ecae1023381f8f)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently, FEATURE_PACKAGE_<feature> isn't in any vardeps, so changing the
packages for a feature won't change the checksum for do_rootfs. Rather than
explicitly adding those to vardeps, just use the expanded form of
FEATURE_INSTALL and FEATURE_INSTALL_OPTIONAL, so the actual list of packages
from the features goes into the checksum.
(From OE-Core rev: fdd1669e04bd8219344b1896b9d9c6a187e4f84e)
(From OE-Core rev: 9697d13e48633515b80b2ab9bab84ca54ce3ed48)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Increase sparse image block size when ROOTFS_SIZE is smaller than
the minimum needed for ext4 to fit into it.
[YOCTO #7664]
(From OE-Core rev: 6938791ff97a23430afb4aa16d71aa8729a12ead)
Signed-off-by: Alex Franco <alejandro.franco@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A few short fixes to splitting/iteration done over package lists
in license.bbclass, package_manager.py and rootfs.py.
[YOCTO #7664]
(From OE-Core rev: a902e98c5938f52ec960e0518e0ceaf8f5ee610c)
Signed-off-by: Alex Franco <alejandro.franco@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The rpm process replace all the "%name" in the spec file by the name of
the package. So, if the package is composed of some files or directories
named "%name...", the rpm package process failed.
Replace all "%" present in files or directories names by "%%%%%%%%" to
correctly escape "%" due to the number of times that % is treated as an
escape character. Jeff Johnson says this is the Right Thing To Do.
[ YOCTO #5397 ]
(From OE-Core rev: 5ed1c7f556df3fafd45d493010cc0bbe74d05ebd)
Signed-off-by: Sébastien Mennetrier <smennetrier@voxtok.com>
Signed-off-by: Michaël Burtin <mburtin@voxtok.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
nativesdk has been a prefix rather than a suffix for some time now.
(From OE-Core rev: 940b9d1736dbe63f80b9d46b2b9b1cea77ed35f1)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
cmake expects target architecture strings in the format of uname(2),
which do not always match TARGET_ARCH (e.g. powerpc vs ppc).
(From OE-Core rev: 7c61d022aa9bbba3c2f8a2df46eeb19e2772c89a)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream, xz has been the only format for some time now, so let's
make it the default and adjust recipes that package old stuff.
(From OE-Core rev: 0f9ea90dde8f63aace19531e066580e41bf3d7cc)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We redefine LD to point to ld.bfd when building kernel, which works in
most cases since kbuild system calls out for bare LD most of the time,
however some of newer kernels e.g. 4.1+ have some code added which can
call gcc directly to do the linking job e.g. arm vdso code
This causes build failures when we have configured the default cross
toolchain to use gold linker as default. Errors like
BFD: arch/arm/vdso/vdso.so: Not enough room for program headers, try
linking with -N
| arm-angstrom-linux-gnueabi-objcopy:arch/arm/vdso/vdso.so[.hash]: Bad
value
start happening.
With this patch we force gcc to choose bfd linker as well
(From OE-Core rev: 5724e4d245f142ac6fb1ea211503fd220683354d)
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>
The gnome class is really a convenience class to include other classes, so move
the introspection arguments into gnomebase.bbclass.
(From OE-Core rev: ad7073194546c16a5612924eb59152b35de6f340)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Often configure scripts or Makefiles that use the stub scripts written by
binconfig-disabled fail mysteriously with no obvious problem. Attempt to solve
this by writing an error to stderr which hopefully makes it to the logs.
[ YOCTO #8169 ]
(From OE-Core rev: c38acd720b3f6ffbeb544063692eb471dada8593)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow UTF-8 characters on control files. Also handle an expection
in case of invalid characters (non UTF-8).
[YOCTO #6693]
(From OE-Core rev: 4096f3c5d309161999adc996fdfa7526e5504366)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In recipes that are exempt from source code archiving due to
COPYLEFT_LICENSE_EXCLUDE, do_deploy_archives does not have a transitive
dependency on do_unpack. Given enough parallelism, this means
do_deploy_archives can run at the same time or before do_unpack.
Because do_deploy_archives did not specify a working directory, its
working directory was ${B}, which defaults to ${S}, which may be set by
a recipe to a directory that is created by do_unpack.
In this case, do_deploy_archives can fail because do_unpack deletes and
re-creates the directory and do_deploy_archives cannot change into the
non-existent directory. Avoid this problem by explicitly specifying
a working directory for do_deploy_archives (and for
do_deploy_all_archives as well for good measure).
(From OE-Core rev: e22685ff11af6d54c939aa8f327a0aaa1557fbbc)
Signed-off-by: Clemens Lang <clemens.lang@bmw-carit.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Usually, the host's tar command is sufficient. However, special cases
like archiving xattrs depend on a modern GNU tar version. The new
IMAGE_CMD_TAR makes that possible, with xattrs given as example.
(From OE-Core rev: d8db122114f4d0600b662f79b3673108b4b6c0b7)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The following IMAGES_FSTYPES defaulted to ext3:
"vmdk", "vdi", "qcow2", "live", "iso", "hddimg"
This patch changes the default for those IMAGES_FSTYPES to
ext4 in order to bring the images more in line with other BSPs.
Besides improvements in performance and reliability ext4 provides
additional functionality as well (option to turn off the journaling,
dynamic resizing of VDI volumes etc.).
(From OE-Core rev: 2b56d671d2f0ef22786c97e29e1215eb80c94490)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Building uImage fails when KEEPUIMAGE is not "yes".
Remove wrong removal of linux.bin before compressing it.
(From OE-Core rev: ed5c6a0c80bac092e98f4d68dbc9cad77701bc7e)
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Include by default all the files needed to perform checkpkg task.
These files are copied from meta-yocto because they refers recipes in
oe-core, the only missing file are maintainers.inc because it needs
consensus between OE-Core and Yocto project to define a common set of
maintainers.
[YOCTO #7895]
(From OE-Core rev: 973f898e15cf6d1b6715d08da9dc740ee040e0dc)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This deletes and therefore breaks PACKAGECONFIG[doc], so revert.
This reverts commit b741780d43.
(From OE-Core rev: 45cff248f5f9f4fb2498c34963e6652cc1166737)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Menuconfig is sometimes not the most convenient way to configure a
kernel, as the default color scheme can be hard to read. This variable
gives you access to the MENUCONFIG_COLOR variable or lets you select
nconfig, e.g. by setting it in your local.conf:
KCONFIG_CONFIG_COMMAND = "MENUCONFIG_COLOR=mono menuconfig"
or
KCONFIG_CONFIG_COMMAND = "nconfig"
(From OE-Core rev: fd8880aee4f0f8a535616ef312b283f401f64c7c)
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Older kernels (e.g. 2.6.32) don't create an include/generated directory,
so check that the directory exists before trying to copy files from it
in do_shared_workdir().
(From OE-Core rev: 5bebaf37429c28134aeb6fd261e282e9a0397771)
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>
This change makes broken symlinks stand out clearly instead of bitbake
failing with odd error messages. Tested locally with broken symlink
as SSTATE_DIR, DL_DIR and SSTATE_MIRROR.
Change-Id: I2e92702237ab3bdb897d0bdefcf33480aabbc288
(From OE-Core rev: f635b9c00aa8a69130e471b9507f263a1ba081ff)
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It may be possible that some bootable images do not use a rootfs; this
may be the case if the bootable image utilize only an initrd for all its
needs.
If there is not rootfs, the size calculation will fail. Furthermore, given
that the iso9660 conformance level is determined using the size of rootfs,
it makes sense to not make the calculation if there is not such rootfs.
(From OE-Core rev: 57064ac9ccd8a3783789d11feb5a51351cd924bf)
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use bbnote rather than bbwarn when the user exists, otherwise we would
always get the warnings when rebuild the recipe or build with mulitlib,
everything is OK if the user exists, so it should not be a warning.
(From OE-Core rev: c0da4270c76375a7a8cbcc09319fe4570ebbc5bd)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Print PN will help debug:
WARNING: openssh: user sshd already exists, not re-creating it
Which is better than:
WARNING: user sshd already exists, not re-creating it
(From OE-Core rev: cfde8621d18967dee71042e02b8d6db5661df3da)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The FOO[doc] is set in meta/conf/documentation.conf, we need remove it
from d.getVarFlags()'s return dict when it causes many loops.
(From OE-Core rev: 595a7af8d0a52b24e2bdb5c373c64d27b54bb25b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There was a problem when check invalid PACKAGECONFIG in the anonymous
function (when parsing), for example, there are two versions of a
recipe:
foo_1.0.bb
foo_2.0.bb
While foo_2.0.bb has a "PACKAGECONFIG[item] = 'x,y,z'", but foo_1.0.bb
doesn't, if we set PACKAGECONFIG_pn-foo = "item" in a conf file, we
would get the warning about invalid PACKAGECONFIG for foo_1.0.bb. Delay
the checking to build time will fix the problem.
[YOCTO #8065]
(From OE-Core rev: 0a64dfcdb9f5a37771f881895be230392c4d0aff)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Not all hosts are running sufficiently new coreutils.
(From OE-Core rev: 3a813f277f8daa7686e26edc87f6a88724adde4e)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need to be able to tell people if we WHITELIST a recipe
that contains an incompatible licese.
Example: If we set WHITELIST_GPL-3.0 ?= "foo", foo will end
up on an image even if GPL-3.0 is incompatible. This is the
correct behaviour but there is nothing telling people that it
is even happening.
(From OE-Core rev: c9da529943b2f563b7b0aeb43576c13dd3b6f932)
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use canonical_license when doing evaluation of license expresion since
INCOMPATIBLE_LICENSE are already canonized.
[YOCTO #8080]
(From OE-Core rev: 799b25e09a149303edc1c098935f38a438878a95)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It's already taken care of in meta/lib/oe/recipeutils.py
(From OE-Core rev: f7d0c03dc3cbfb79d22e1d89e31026a97c5b12ae)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some recipes are available only in the -native flavour, and we need to
check their upstream version too from the command line.
(From OE-Core rev: c63d1a544a3021a4eee2171fc710e71dfa7e6b07)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
"n32" is a mips64 variant we need to consider when processing the TARGET_OS
extensions. Also add the multilib extensions for mips64.
(From OE-Core rev: fe26f809aaad5d5d608e841c99b817316c5a59a0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cross packages are built for BUILD_VENDOR/BUILD_OS, rather than
TARGET_VENDOR/TARGET_OS. E.g. there is no point in hardcoding the
target's LIBCEXTENSION and ABIEXTENSION into the STAMPDIR/WORKDIR
variables (set using MULTIMACH_TARGET_SYS).
(From OE-Core rev: 29086fa030d9283261c5840b7ed8227fb419ac3f)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Our multilib cross toolchains have <ml_prefix> as a prefix however we
only have a single gcc-cross-canadian for each arch and it is not
prefixed even in the multilib case. We can have two versions of
gcc-cross-canadian, 32 and 64 bit.
This fixes the multilib PREFERRED_VERSION mapping code so that
no prefix is added to the preferred version and therefore the
right versions of gcc-cross-canadian are used.
(From OE-Core rev: c4b3540fc2b66730e021dd0b0c89b0fbe9dbf77a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In the same way we map various TARGET_OS options back to the single
cross-canadian compiler, add mappings for the TARGET_VENDOR cases we
know about in the multilib case.
(From OE-Core rev: 753c98324ae82a67104eaf36e7ebf3553ee1dad7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
MLPREFIX wasn't being set by the function correctly since its
not an overridden value but directly set. Handle this variable
explicitly so the function returns the expected values.
(From OE-Core rev: 99997043d4106cb8a93a5f4512f1ef6f063a1895)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The "bitbake meta-toolchain" comment is dated and incorrect, fix to
point at -c populate_sdk.
If a toolchain contains multiple environment files, iterate them and run
the sdk test suite on each on in turn rather than giving a fatal error and
giving up.
Also improve the debug output so that rather than PN, it also show the
toolchain tarball under test, and the environment file name its using.
Also enable the accidentally disabled cleanup code.
(From OE-Core rev: 44c8b1bd58397db85e6f7bb9a57f0d57d2c69ad5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ensuring the native pixbuf cache is correct after new loaders have
been installed is tricky. This needs to be done without races
and work regardless of whether the build is from sstate or freshly
built for one or more modules.
This adds a hook into base.bbclass which is then triggered by the
code from pixbufcache. This patch is an improved version which
means base.bbclass has no pixbuf knowledge and the mechanism can
be reused in other cases.
(From OE-Core rev: b411085fefc8582d24c172db5f6610705eb44c2f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is needed when we add nativesdk-gcc/binutil to an SDK. Being
present doesn't hurt in other cases.
(From OE-Core rev: b31a75a11f663d13c8089b8abd3a8fd080aa7e9a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gcc-cross-canadian-<arch> is only built once. It needs to target all the
different libcs, not just the currently selected one. This change
ensures that if another libc is used, symlinks are present such that the
compiler can be found. The base version is always assumed to be "glibc"
with symlinks from musl and uclibc compiler names.
This means gcc-cross-canadian is consistent regardless of which libc is
selected when its build in multimachine builds.
[YOCTO #8025]
(From OE-Core rev: 83ead626c0da75edec2833ffb1a29011ec7b83d2)
(From OE-Core rev: ee16cb0a3f40384f509083f0ef3f36b68f73b7cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gcc-cross-canadian-<arch> is only built once. It needs to target all the
different libcs, not just the currently selected one. This change ensures
that if another libc is used, the compiler correctly selects the right one.
[YOCTO #8025]
(From OE-Core rev: da2e92e256054b137a1646fdad1fe1a47ba3215a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Running "bitbake xxx:do_unpack" resulted in exception at the
BuildCompleted event from toaster.
The reason for this exception was usage of ':' as a field
delimiter in toasterstatlist file. As target can optionally
contain ':<task>' suffix it caused split(':') to throw exception:
File "toaster_collect_task_stats(e)", line 71, in
toaster_collect_task_stats(e=<bb.event.BuildCompleted object at
0x7f8434deed50>)
ValueError: too many values to unpack
Fixed by changing delimiter ':' -> '::'
(From OE-Core rev: 03d01393d14b7b20dcb40ff89b1628883fd3b545)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If you build a user of updated-rc.d like udev, as things stand currently
nothing pulls in updated-rc.d but there is a dependency added on the
package at do_package time. This can lead to errors during rootfs
construction either with licensing. The fact its a RRECOMMEND means
the image are not deterministic.
A particularly good test case for reproducing this is:
MACHINE=A bitbake core-image-minimal
MACHINE=B bitbake core-image-minimal-initramfs
and since the second machine can find the package but not the license
manifest, a failure will result.
Extending the DEPENDS is the easy way to fix the issues.
(From OE-Core rev: 164b1b54c4b3127733bcd0a21b379bb6869693cc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The linux-yocto tree has always been a combined set of kernel changes
and configuration (meta) data carried in a single tree. While this
format is effective at keeping kernel configuration and source
modifications synchronized, it isn't always obvious to developers on
how to manipulate the meta data versus the source.
With this change, we remove the meta data processing from the
kernel-yocto class and use the external meta-data repository that
has always been used to seed the linux-yocto meta branch.
After this change, linux-yocto can no longer process combined trees,
and is simplified as a result.
(From OE-Core rev: 523e4f6a6913b64453579d27a02467e14f7df42e)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add support for qcow2 image format. Implemented in the same way as
the previously existing vmdk and vdi solutions.
(From OE-Core rev: c1f9ed400e4b5fe5be4fac86021dea11a7546035)
Signed-off-by: Christian Ziethén <christian.ziethen@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building for qcow2 and a dummy kernel, avoid installing
a non existing bzImage.
(From OE-Core rev: 7d476f117c62e532c99abef5728e729b8001fa32)
Signed-off-by: Christian Ziethén <christian.ziethen@linaro.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Christopher Larson
Juro Bystricky
Alex Franco
Sébastien Mennetrier
Paul Eggleton
Alexander Kanavin
Khem Raj
Ross Burton
Leonardo Sandoval
Clemens Lang
Patrick Ohly
He Zhe
Aníbal Limón
Stefan Müller-Klieser
Andre McCurdy
Mikko Rapeli
Pau Espin Pedrol
Ricardo Neri
Robert Yang
Beth Flanagan
Richard Purdie
Dmitry Eremin-Solenikov
Ed Bartosh
Bruce Ashfield
Christian Ziethén