Scenario:
a) libtool script is built on system with bash as /bin/sh
b) machine B installs sstate from build a)
c) machine B has dash as /bin/sh
In this scenario, the script fails to work properly since its expecting
/bin/sh to have bash like syntax and it no longer does have it.
This patch forces the configure process to use /bin/bash, not /bin/sh
and hence allows the scripts to work correctly when used from sstate.
(From OE-Core rev: 24d5b449e5f4d91119f0d8e13c457618811aadfc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit 22f90c5aec4f0b0360d1d960226f9965d83d589b.
This causes build failures with:
| dirname: missing operand
| Try 'dirname --help' for more information.
under some circumstances.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previous change (086ce22b88f5ef5f75a83119a32c8b3fdcfa296d) broke
the creating of vmdk images. This protects shell expansion variables
and let dd generate the image to be transformed to vmdk by image-vmdk.class.
(From OE-Core rev: 2fe667afbdc6880c377657b5ff27e6db3b6cbe77)
Signed-off-by: Joao Henrique Ferreira de Freitas <joaohf@gmail.com>
[edit to change the usage of IMAGE_FSTYPE to IS_VMDK]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The note issues when OECMAKE_BUILDPATH and OECMAKE_SOURCEPATH were being used
stated that an in-tree build would be done, but the default is in fact an
out-of-tree build.
(From OE-Core rev: 0dafb9f78e9ab9ec1a1483efc37902c2e8de3623)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently, if YOCTOADT_TARGETS does not contain an architecture but the
rootfs/machine settings are uncommented, then the rootfs is installed
and adt will throw an error because is not able to find the toolchain
environment script.
This patch will:
* not allow to install a target rootfs if the toolchain for the
target architecture is not selected;
* uncomment the target rootfs/machine settings for the other
architectures since it's easier for the user to just add a new
architecture in YOCTOADT_TARGETS and have the target rootfs
installed;
[YOCTO #5727]
(From OE-Core rev: 22351d27de76b39cb71904396e73497e36d9e1d6)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ocasionally AB shows odd false fails like:
http://autobuilder.yoctoproject.org/main/builders/nightly-arm/builds/1/steps/Running%20Sanity%20Tests/logs/stdio
This should fix that by checking for eof instead of
polling the return code of the ssh process, because the process
might still be there.
(From OE-Core rev: 3a22b5df5aa38a98b35bc2931d646a2b7702fbec)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There's a configure option for GIO sniffing so don't use a patch to disable it.
Instead use a PACKAGECONFIG for this and default to off, as using GIO for
sniffing means a hard dependency on shared-mime-info.
(From OE-Core rev: 624e79deb58c08bcc32053e792df140f527d20b1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove spurious libxcb-xinerama addition to PACKAGES, this is handled by the
dynamic split_packages() now.
(From OE-Core rev: cfb0b1124d38c332536abb5d3e2726a3b8993140)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is a potential problem if we don't remove the previous version's
stamp, for example:
The depend chain is:
libtool-native -> autoconf-native -> m4-native
We have two m4-native: 1.4.9 and 1.4.7
1) Clean all of them to make a fresh build so that we can reproduce the
problem
$ bitbake m4-native autoconf-native libtool-native -ccleansstate
2) Build libtool-native so that the m4-native_1.4.17 will be built
$ bitbake libtool-native
3) Set PREFERRED_VERSION_m4-native = "1.4.9" and build again
$ bitbake libtool-native
4) Set PREFERRED_VERSION_m4-native = "1.4.17" and build again
$ bitbake libtool-native -ccleansstate && bitbake libtool-native
Then the build will fail:
[snip]
| m4: unrecognized option '--gnu'
| Try `m4 --help' for more information.
| autom4te: m4 failed with exit status: 1
[snip]
The is because when we change m4-native to 1.4.17 and build
libtool-native again:
5) libtool-native depends on autoconf-native, and autoconf-native's
version isn't change, so it can remove the current stamp and mirror
the sstate (the one depends on m4-native_1.4.9) from the SSTATE_DIR
correctly.
6) The mirrored autoconf-native depends on m4-native_1.4.17's
do_populate_sysroot, and the stamp is already there (which is made
by step 2), so it would do nothing, but this is incorrect, since
the one that really in the sysroot is m4-native_1.4.9, then the
error happens.
Remove previous version's stamp in sstate_clean() will fix the problem.
[YOCTO #5422]
(From OE-Core rev: 4659d29b1040349116549644e45035a5b37d9311)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dash can't handle the or [[ in parameter expansion, for example:
A=/usr/bin/[[
B=[[
C="${A%$B}"
The C should be "/usr/bin" in common, but it will be /usr/bin/[[ on
dash, use dirname to fix it.
NOTE:
There are 3 lines about parameter expansion, only fix the
DIR="${DIR%$TGT}" since the other 2 works will and are very useful in
this case.
[YOCTO #5712]
(From OE-Core rev: 22f90c5aec4f0b0360d1d960226f9965d83d589b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the build error of autogen-native which depends on guile-native:
ysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:40:24: error: expected ')' before '__attribute__'
sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:40:24: error: expected ',' or ';' before ')' token
sysroots/x86_64-linux/usr/include/guile/2.0/libguile/error.h:42:27: error: expected ')' before '__attribute__'
[YOCTO #5743]
(From OE-Core rev: 05d226bee199e9d45f0bb6143d3a78f3f2e93186)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* move read_shlib_providers before registering package as provider
and show warning when different package tries to provide something
already provided.
[YOCTO #4628]
(From OE-Core rev: 8141e3f61f12c8901b990496bcf6b76a9db95a57)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* prepare for reading shlibs providers only from dependency tree of
current recipe
[YOCTO #4628]
(From OE-Core rev: c5076f33ac27c0c2b0743bf6dc4edc983254c467)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* unify debug messages a bit
* old implementation allowed partial match in blacklist, it's safer
to explicitly list exact matches
* I was able to build all entries from system_package_blacklist with
icecc enabled, lets assume that they were already resolved by newer
versions (we've fixed a lot of parallel issues in recipes which were
detected even without icecc and this list is very old).
(From OE-Core rev: 5a5319d2e6f41bb0e290d6a1decbd996e9572690)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* for different MACHINES
* is there more elegant way to have "overridable" function so that
signature handler properly uses only the branch without
STAGING_BINDIR_TOOLCHAIN?
(From OE-Core rev: 418a353a011ca8f04ecc3e2d29f2d1a415492081)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it was introduced in
commit 3a842ec52e7d010767b13bdcb5629ac07b3ee9e7
Author: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Fri Sep 16 10:55:16 2011 +0400
Subject: icecc.bbclass: replace with updated version
without any explanation in which case
${ICECC_CC} -print-prog-name=as
is returning as in current working directory, but will keep old
behavior just in case
(From OE-Core rev: 6092da20fc3ceb1bc6b4872ad16df565f05723b7)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it's needed for use-case like this:
# Inherit icecc here, so that all builders have the same sstate signatures
INHERIT_DISTRO += "icecc"
# and then disable its function by default (so that people still need to explicity
# enable it in local.conf if they have configured icecc and want to use it.
# You need to set _empty_ value in local.conf to enable icecc function:
# ICECC_DISABLED = ""
ICECC_DISABLED ??= "1"
* so default ICECC_PARALLEL_MAKE is still empty, but we want build
to respect our PARALLEL_MAKE, unfortunately we cannot do something
like ICECC_PARALLEL_MAKE ??= "${PARALLEL_MAKE}", because that would
cause PARALLEL_MAKE to reference itself.
(From OE-Core rev: 7e586d5b7c8c7f20eafc32624200f60a8ed9a582)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* set empty TARGET_PREFIX
This has a bit weird reason caused by unsupported setup where
external-toolchain is used in some DISTRO only for some MACHINEs
and internal is used for other MACHINEs.
Because external-toolchain usually comes with different TARGET_PREFIX
it was causing allarch recipes to have different signatures even
when they don't use toolchain at all.
Empty TARGET_PREFIX also helps to find allarch recipes which still
have default dependency on e.g. virtual/${TARGET_PREFIX}gcc.
* add TARGET_FPU just for completeness (it was used in icecc.bbclass
but now it's vardepexcluded there as well)
(From OE-Core rev: 180ba7f6603b35eb66946649d8860022d2c329b7)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* I don't have any real evidence or good statistics for this, but when
comparing signature dumps from my big bitbake world builds I usually
see a lot of rebuilds caused by changes in .bbclasses and only very
rare would be the case where oe-core upgrade brings changes in -native
recipes and no change in .bbclasses used from target recipes
* changing the default to include them shouldn't cause significant
increase in rebuilds and sstate reuse a bit safer
* people working on toolchain (e.g. using gcc from AUTOREV) can easily
extend sstate_rundepfilter to ignore them again (it's easier than
removing existing filter), example how add own signature handler in
your layer is here:
9ac3a7c803
(From OE-Core rev: 336a7897e39b9e42dcfcba9e2520ea96b0c6a8d6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This code makes no sense, native.bbclass clears PACKAGES anyway. Drop
it.
(From OE-Core rev: 9c8d9781794ed0886a79c8ce4544ba98be0ff858)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In small configurations its useful not to have python dependencies. This
patch adds code to disable those using PACKAGECONFIG. This allows us to
fix poky-tiny after the recent move of update-alternatives to opkg-utils.
(From OE-Core rev: 0c0039048fd97cdd3cf28f9e1c829a716dfd68ea)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the tests are enabled then configure will check for the presence DBus. It's
generally present through the runtime dependencies so this often succeeds but as
it isn't a build dependency it's possible for DBus to be present at configure
time but removed at compile time, resulting in build failures.
(From OE-Core rev: 0150e86a7609579cf26f5ef5c6c69b521340218e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Made modifications to account for:
- .siginfo files present in sstate-cache from non sstate-enabled tasks
- new naming format for sstate files
(From OE-Core rev: d23ad4255ad7465383286fa7805392aa70845ace)
Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have moved the header files to ${includedir}/tcl${VERSION}, but we
didn't fix the TCL_INCLUDE_SPEC which is still ${includedir}, it should
also be ${includedir}/tcl${VERSION}
Note: this commit modifiey alter-includedir.patch, so it doesn't look
very clear, I only fixed one line in both configure and configure.in:
-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
The other changes are because I use git to create the patch while the
previous one uses svn.
[YOCTO #5732]
(From OE-Core rev: a263281d9c774a03cce76caa3cc477cc85a9c2a9)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Catch some u-a-cworth references that slipped through the move of u-a
to opkg-utils and its rename to -opkg.
(From OE-Core rev: a9ff0bbac5ae0688525c71f0a358f0750a277269)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.
(From OE-Core rev: 7e0adf676da45e49287b7ce6478a6dbfd8fa117f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allows a layer to define new classes in <layer>/lib/oeqa/utils/controllers.py
and completely control or extend deployment of a target. (core currently
has QemuTarget and SimpleRemoteTarget).
The value of TEST_TARGET must be the name of the new class.
(From OE-Core rev: 9b81aff0aca42353d448b1e9522f89842e23c7b2)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently, pressing CAPS_LOCK on the viewer changes the lock state on
the server and the key will not change the case.
To fix this, use -skip_lockkeys option to ignore all Caps_Lock,
Shift_Lock, Num_Lock, Scroll_Lock keysyms received from viewers, in
order to leave the lock state on the server side unchanged. However, the
keys will appear correctly on the remote side.
[YOCTO #4149]
(From OE-Core rev: 1e06d5ce83439b5bd75a958f305e6a880d40333d)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
configure fails with:
| configure:15654: checking for WESTON_LAUNCH
| configure:15661: $PKG_CONFIG --exists --print-errors "libdrm"
| Package libdrm was not found in the pkg-config search path.
| Perhaps you should add the directory containing `libdrm.pc'
| to the PKG_CONFIG_PATH environment variable
| No package 'libdrm' found
| configure:15664: $? = 1
| configure:15678: $PKG_CONFIG --exists --print-errors "libdrm"
| Package libdrm was not found in the pkg-config search path.
| Perhaps you should add the directory containing `libdrm.pc'
| to the PKG_CONFIG_PATH environment variable
| No package 'libdrm' found
| configure:15681: $? = 1
| configure:15695: result: no
| No package 'libdrm' found
| configure:15711: error: Package requirements (libdrm) were not met:
|
| No package 'libdrm' found
and configure.ac says:
| if test x$enable_weston_launch == xyes; then
| PKG_CHECK_MODULES(WESTON_LAUNCH, [libdrm])
(From OE-Core rev: 6d0625a5a2ddd34760b2f85366810f20ad4ea15e)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The new provider is the opkg-utils recipe.
(From OE-Core rev: c63d241d15608ac431a1d716ec84ef568928cf85)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows dependencies to be added to the opkg recipe without causing circular
dependency loops. As opkg-utils has minimal dependencies it is the best recipe
to provide update-alternatives.
This partially solves Yocto Project issue 4836. More work is still needed for a
complete solution.
(From OE-Core rev: 2f18289493f9c2c67ba343fb8e16743bf5dfee24)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The latest version of opkg-utils PROVIDES virtual/update-alternatives via a
script copied from opkg, packaged as update-alternatives-opkg.
The nativesdk class is added to the recipe to ensure that
nativesdk-update-alternatives-opkg is built.
(From OE-Core rev: 1e2c38ce13f8e4b25d8656d237343380cbc970aa)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Exiting explicitly in pkg_postinst makes it impossible to use the
update-rc.d class in a .bbappend because the link creation is appended
to the pkg_postinst script.
(From OE-Core rev: 758d53d3044f29f3c33ffee3ada88c9edc9f864f)
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The mappedfile ptest was attempting to write into directories that may not exist
on a non-Sato image. Instead, write into TMPDIR.
(From OE-Core rev: 93b4ecc263947826421d5b4fb1f99fe506b24287)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This test was attempting to connect to a session bus and hanging if it couldn't.
Take a patch from upstream to correctly use a private bus.
[ YOCTO #5696 ]
(From OE-Core rev: 12e30b653899567312a7ec29b6e972c85ba8e25e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- SStateBase now has its own module to be imported by itself by other modules like sstatetests.py
(From OE-Core rev: 8163854adf87ac42a8f08ee25685d0ce1efb4724)
Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- SStateBase object contains basic methods used to run sstate related tests
- SStateTests now contains only sstate-related tests
(From OE-Core rev: 78e929bbcdce1f9a544b230433b93f4fc1f841e2)
Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Adding "doc-pkgs" to IMAGE_FEATURES (in an image recipe) reports a conflict with reset.1 file, present both in util-linux and ncurses-doc packages.
<log>
| Collected errors:
| * check_data_file_clashes: Package util-linux-doc wants to install file /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/rootfs/usr/share/man/man1/reset.1
| But that file is already provided by package * ncurses-doc
| * opkg_install_cmd: Cannot install package util-linux-doc.
| WARNING: /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/run.do_rootfs.13877:1 exit 255 from
| opkg-cl -f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall --prefer-arch-to-version install `cat $1`
| ERROR: Function failed: do_rootfs (log file is located at /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/log.do_rootfs.13877)
</log>
Same issue already occured few months ago:
Re: [OE-core] Clashing man pages
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg38590.html
(From OE-Core rev: 67499dbffd0f7241fd199b7fb94edfe2cebe8a9b)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
init-live.sh: $CMDLINE variable should be provided to switch_root
to let user specify runlevel on grub command line.
Feeding with -c /dev/console as well as busybox switch_root enables that option.
(From OE-Core rev: 5a2f4feeaac4f9278fa0cf808c2f495f0c19324f)
Signed-off-by: Krzysztof Sywula <krzysztof.m.sywula@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have the odd situation where the CONTROL/DEBIAN directory can be removed
in the middle of the walk, the isdir() test would then fail and the walk code
would assume its a file hence we check for the names in files too.
This resolves the autobuilder failure:
error: File not found: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-fsl-arm/build/build/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/xinit/1_1.3.3-r0/package/DEBIAN
RPM build errors:
File not found: /home/pokybuild/yocto-autobuilder/yocto-slave/nightly-fsl-arm/build/build/tmp/work/armv7a-vfp-neon-poky-linux-gnueabi/xinit/1_1.3.3-r0/package/DEBIAN
(From OE-Core rev: e38d7702be279d6d6d4c79b3f2379e689a7473d2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Specify the location of the alsa headers using ${includedir}. Without
this no headers get added to the image when the alsa-lib-dev package is
included.
(From OE-Core rev: 720d30aa5f0745185fc948376ce284cc17f0edb0)
Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie
Joao Henrique Ferreira de Freitas
Chen Qi
Ross Burton
Laurentiu Palcu
Stefan Stanacar
Robert Yang
Andreas Oberritter
Martin Jansa
Corneliu Stoicescu
Bruce Ashfield
Andreas Müller
Paul Barker
Alexandre Belloni
Matthieu Crapet
Krzysztof Sywula
Andrew McDermott
Saul Wold