If no files have been staged we want to continue without error instead
of showing a traceback.
Fixes [YOCTO #4056].
(From OE-Core rev: ca36be708e54c0c86535bc8512295c76c48f6cf5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
librsvg depends on gtk+, which in turn does not support framebuffer
as backend in current version (2.15.24). This patch disables librsvg
when x11 is not in the distro.
(From OE-Core rev: 022cc0d3f0f7468428d708c27dbc561f619ee841)
Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Current verion of gtk+ (2.15.24) does not accept pure framebuffer as
backend and some alsa-tools sub-modules depend on gtk+.
This patch removes those sub-modules from the build only when x11 is not
set in DISTRO_FEATURES.
(From OE-Core rev: e611bba7bba02ba167b2ae3671b00cc99e4fb29c)
Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 'armel' override for DKPG_ARCH was causing the meta-toolchain
build to fail. The assignment was moved to an anonymous fragment
of Python code, so it doesn't affect the assignments in
cross-canadian.bbclass anymore, thus fixing the issue.
[YOCTO #4080]
(From OE-Core rev: 6f86fe5d66e401377bccd9f635270033b99a9f4b)
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>
This is useful for users that want to .bbappend this recipe to select specific
modules to be compiled.
(From OE-Core rev: 2ddb7afd15e53ef75b5084d691115e0f58ff24ab)
Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* when enable busybox installs getopt to ${base_bindir} and
util-linux to ${bindir}, so there is no file conflict, but
because busybox implementation does not support --long used
by lsb_release (which RDEPENDS on util-linux) we need to use
util-linux getopt even when busybox defconfig has it enabled
(From OE-Core rev: 2dcc867247b402bb4223cc7b9861088958599866)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
srpm archiving doesn't need to be handled as a different case
when deciding what archive tasks to add.
When srpm is selected as the archiving type, the scripts and logs
archive staging directory ${WORKDIR}/script-logs is cleaned, and
its contents moved out to ${WORKDIR}.
Now that we are including ${WORKDIR}/script-logs in sstate-inputdirs,
the directory must be preserved.
[YOCTO #4032]
(From OE-Core rev: 0c80286a3383b436a0a63a0b00eb357dd9dea4fb)
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When processing the blacklists, we should avoid cross-canadian packages, as they
will not have any multilib prefixes to expand.
Similarly look for "virtual/nativesdk-" in addition to the existing "nativesdk-".
These items should also be ignored.
Finally, in order to avoid undeterministic variable key expansion, such as:
MYVAR = "foo"
PREFERRED_PROVIDER_${MYVAR} = "bar"
PREFERRED_PROVIDER_foo = "foobar"
during the multilib processing of PREFERRED_VERSION and PREFERRED_PROVIDER,
the code was changed to rename the variable key, to the final key. This along
with the existing code avoids the problems.
(From OE-Core rev: 1416613e94af46c6e74532bca0f026d1540becbb)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* different shells different behavior?
bash prints 'type: update-rc.d: not found' on stderr
busybox's sh on stdout
(From OE-Core rev: 45e22312c48b23480bd6dff98702b0691a48f7d1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sysvinit/systemd assumes that update-rc.d can be inhibited
* with systemd enabled, sysvinit scripts are missing in packages
and update-rc.d needs to be put in BAD_RECOMMENDATIONS to prevent
update-rc.d trying to install them in postinst
* update-rd.c shouldn't be in DEPENDS
(From OE-Core rev: e9e4a90c7e66abe2ab2c335d60ef91e869f48693)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The licenses need to be included onto rootfs so we have a new package
for license file when we have multiple packages for same vendor. This
patch does this change for current packages in this specific case.
(From OE-Core rev: b4113c1272a4e97e1791f4dfe02a2cd3c664c61d)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The rtlwifi will is deployed onto /lib/firmware so we don't need to
duplicate it inside of rtlwifi subdir.
(From OE-Core rev: 63efc03b4b77f5a0c79e57427874d40fa769d388)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 'Makefile' should not be deployed in the packages as it is of no
use for target and end user.
(From OE-Core rev: c3a0225191eef45cae5aae771ce7c630155be45b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it's not part of sources, downloading some html from web is not better
check then using meta/files/common-licenses/EPL-1.0
* http://www.eclipse.org/org/documents/epl-v10.html was changed, plain
text looks the same, but html formating was changed (from MS Word
export to valid XHTML 1.0, changing checksums for this new html
would cause issues for people with old epl-v10.html already on
PREMIRROR, so lets just remove it.
(From OE-Core rev: 22bce79652fc753a7b5d536664b744e110b5775a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gtk-update-icon-cache-native is the only provider now
(From OE-Core rev: 7e437aa3e0ec862aac69a4434be0b2b652d26972)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The only part required from native build is gtk-update-icon-cache. This is
provided by gtk-update-icon-cache-native_3.4.4. This version works properly
with gtk+. The patch was tested for gnome-icon-theme and hicolor-icon-theme by:
1. building xfce/gtk+ (gtk3-less) image
2. checking for existing icon-theme.cache in rootfs
3. running image / open menus + test applications
4. executing 'gtk-update-icon-cache-2.0 --validate <both icon-themes-dirs>'
5. executing 'gtk-update-icon-cache-2.0 -f <both icon-themes-dirs>' + exact size checking
(From OE-Core rev: 8d6406849bcad2a7bbd4483ccfa4e0f3d9b4ae21)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Poky distro codename info added to /etc/lsb-release file.
lsb_release script will not complain anymore about
the incompleteness of /etc/lsb-release file by
returning an error code.
Increases LSB compliance.
Partial fix for [YOCTO #4071].
(From OE-Core rev: ddd43fcdb8af7d5b1a64d2c6cbd72a3896869321)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This changes definition of PCMCIAUTILS_VERSION to string from a multichacter constant to avoid segmentation fault of pccardctl command.
(From OE-Core rev: aee67a229304827a12b7776a82fb1c320da9a3c4)
Signed-off-by: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added support for correctly configuring
wired interface if systemd is the init system.
Fixes [YOCTO #4041].
(From OE-Core rev: ec5530779df23ea25729c7d19c664c05fae5758d)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Under some conditions (ACLs enabled, NFS) mv can interactively prompt
before overwriting files. Avoid hanging builds in that case by using
-f which should be harmless in other cases.
(From OE-Core rev: b1a085db9d8ad2a3117af6f50e510bc9c2f9407b)
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating to 3.8.4-rt2 to fix the minor issues found with -rt1.
>From the upstream commit log:
changes since v3.8.4-rt1:
- build fix for i915 (reported by "Luis Claudio R. Goncalves")
- build fix for fscache (reported by tglx)
- build fix for !RT (kernel/softirq.c did not compile)
- per-cpu rwsem fixed for RT (required only by uprobes so far)
- slub: delay the execution of the ->ctor() hook for newly created
objects. This lowers the worst case latencies.
Known issues:
- SLxB is broken on PowerPC.
(From OE-Core rev: cd9a730caf6b995c25c71c97eb76dc7a24ecf641)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
commit 61001aa [kernel-yocto: respect SRC_URI modified branch selection]
changed branch processing such that a branch specified in the SRC_URI
would set the branch forced as the build branch.
This change broke compatibility with the yocto-bsp, linux-yocto-custom
based recipes. These recipes specify the branch to be built via KBRANCH,
but allow the fetcher to use master for keeping the repository up to
date. This means that no explicit branch is set in the SRC_URI and the
routines return the default branch of 'master', which is not what is
set in KBRANCH.
To support this case, we simply pass a default branch into the routine
returning the branch to build, and ensure that the default is KBRANCH
so if no branch is passed in the SRC_URI, KBRANCH is always built.
[YOCTO #4145]
(From OE-Core rev: 0c389f41d7ea0697a5468c73cce295a2fa64e9e0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
During the 3.8.4 integration there was a build issue on MIPS due to
SA_RESTORER changes. A solution was put in place for mips, but it
didn't cover other impacted architectures.
This is a backport of the proposed fix for the next 3.8-stable,
since the full -stable might not be available in the right timeframe.
(From OE-Core rev: 1d7a5ac1cea1a5bdb6a9d3dd822439c070066272)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
remake fails with errors during configure due to the out of tree build changes.
This ensures the configure commands run correctly on files in ${S}.
[YOCTO #4139]
(From OE-Core rev: 166c123bc0d121eeea39db71e63940fa2f8a3f7b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If package-management isn't in IMAGE_FEATURES, the postinstall handler
wasn't being installed. rpm needs to depend on this to ensure it does
get installed.
[YOCTO #4160]
(From OE-Core rev: 0c2778c36f521d019ab6ff0c458a1e117808d2e5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of running lsb_release -a, a lsb_release -ir will be run.
This will prevent issue with distros that don't have all the needed
info in /etc/lsb-release file, in which case lsb_release won't generate
an error code.
Partial fix for [YOCTO #4071]
(From OE-Core rev: 79a2252545ab50c79e00e02c328191c1163f917d)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since we provide those files manually (i386_gendis, which is needed for
generating those files, has to be run on host and would fail when
compiling for other architectures), the mentioned compilation targets
in libcpu/ are not needed anymore.
This change will avoid a nasty race condition when running "make -jX
install" resulting in a zero size libebl_i386.so file. The issue happens
because, at "make install" time, the *_dis.h prerequisites will be newer
than the target itself, triggering a chain of recompilations while, in
the same time, the binary files are copied to the destination directory.
Hence, the zero sized file...
[YOCTO #4131]
(From OE-Core rev: a4ebe0f6efc8ed93521e75919f23821f59934c1f)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Extended the functionality of packageinfo.bbclass
so that the sistem retrieves information about the
files brought in by each package. This is done
(without activating buildhistory) by parsing
the packages-split directory for each package.
(From OE-Core rev: 108bae276fe7e462378073207a3bdca7326f8e57)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
remove-gets.patch removed as issue is fixed upstream.
(From OE-Core rev: c2fd59028a57356cff8d165edb71c45c3b05cc67)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dbus-ptest recipe doesn't produce an output package called
dbus-ptest. What we are interested in is actually the dbus-ptest-ptest
package.
(From OE-Core rev: f3c75400d93ab7f22f6de41db4e456d47af2e13b)
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Booting an image generated with squashfs-lzma results in a kernel
error: "Filesystem uses "lzma" compression. This is not supported".
Currently (well at least in Linux 3.8) the officially supported
decompressors are:
* LZO
* XZ
* ZLIB
This change makes sure we use a supported compression algorithm for
squashed root filesystems.
(From OE-Core rev: d915e2e084257830c43f7f21af3aec24b7e1a211)
Signed-off-by: Marc Ferland <ferlandm@sonatest.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Current LSB 4.1 test suite still check libpng12.so, so add libpng 1.2.x
back, and set it as default verison for linuxstdbase image.
[YOCTO #4015]
(From OE-Core rev: f2463ce26706b971dad0116e8b92f9d55e945137)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
/etc/udev/scripts/mount.sh is removed by init-install.sh, but the udev
rules file which specifies the invocation of this script is not removed,
thus causing the error message '/etc/udev/scripts/mount.sh: No such file
or directory' shown at a live install.
The /etc/udev/rules/automount.rules no longer works once the mount.sh script
is removed. So we remove it to avoid the error message.
[YOCTO #3924]
(From OE-Core rev: 6b6db7b4fb7aa17b8e29076decc830149b9d35bc)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Makefile in the package tries to set _FILE_OFFSET_BITS=64,
but we clobber that with our CFLAGS, so we add it in
the recipe.
[CQID: 409915]
(From OE-Core rev: ac904b9e10ec9641686bc35dcf200b9b855899b1)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The current boost recipe only creates the bjam build tool during
a native run and thereby is not usable for other native recipes
that depend on a boost library. Split out the build tool into its
own bjam-native recipe and add real native support to the boost
recipe. Additionally replace the boost-native with bjam-native in
the DEPENDS. This allows recipes to depend on native boost
librarties without increase of the build time for other use cases.
Native compilation of bzip2 isn't working and therefore disabled.
(From OE-Core rev: aec1e3484d89a3ef0fb5b3470a620cc055f66c37)
Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Possibility to customize the text that is presented to the user when
they execute the script.
(From OE-Core rev: 6ad06582621fc20d09d4d7fd78ea7e175367c187)
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Tested-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Collect SRCREV information in a separate task and write it out in a
format which is more consistent with the rest of the buildhistory
output. Using a task means that SRCREV values will also be recorded for
native recipes and not just target ones, and the new formatting also
correctly handles multiple entries in SRC_URI.
Also adds scripts/buildhistory-collect-srcrevs which will report on all
of the recorded SRCREV values in a format suitable for use in global
configuration (e.g. local.conf or a distro inc file) to override AUTOREV
values to a fixed set of revisions. Example output:
# emenlow-poky-linux
SRCREV_machine_pn-linux-yocto = "b5c37fe6e24eec194bb29d22fdd55d73bcc709bf"
SRCREV_emgd_pn-linux-yocto = "caea08c988e0f41103bbe18eafca20348f95da02"
SRCREV_meta_pn-linux-yocto = "c2ed0f16fdec628242a682897d5d86df4547cf24"
# core2-poky-linux
SRCREV_pn-kmod = "62081c0f68905b22f375156d4532fd37fa5c8d33"
SRCREV_pn-blktrace = "d6918c8832793b4205ed3bfede78c2f915c23385"
SRCREV_pn-opkg = "649"
Some notes on using this script:
* By default only values where the SRCREV was not hardcoded (usually
i.e. AUTOREV was used) are reported - use the -a option to see all
SRCREV values.
* The output statements may not have any effect in the face of overrides
applied elsewhere; use the -f option to add the forcevariable override
to each output line to work around this.
* The script does not do any special handling for multiple machines;
however it does place a comment before each set of values specifying
which triplet they belong to as shown above.
Relates to [YOCTO #3041].
(From OE-Core rev: 2179db89436d719635f858c87d1e098696bead2a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
udevadm is now moved from /usr/bin to /bin so account for that
bash completions for udevadm should be packages with udev-utils
since thats where udevadm itself is, they were in systemd package
which is not correct location for it
Backport patches for readahead fixes on spinning disks
and to tackle error reported on missing /etc/sysctl.conf
(From OE-Core rev: 0e692e846e5d6685619a7ce9f6e7346ced013b9b)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1. Split out run-postinsts script into separated package, sometimes only the
postinsts script is required to run all postinsts scripts in /etc/rpm-postinsts/
instead of the whole rpm package.
2. Set ROOTFS_PKGMANAGE_BOOTSTRAP to rpm-postinsts
(From OE-Core rev: 056490ddbfdbb6cc6fa0d8ff8716d64819d6b16c)
Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In some cases, /etc/lsb-release file is used to extract
info about poky build host machine. But the strings are
not stripped of end of line special characters. As such,
when this info is concatenated and used as a directory
entry in sstate_cache, this is an issue.
Usually, this issue is masked by the fact that distro
related info is extracted from the output of lsb_release
command. In case of Yocto Linux, running "lsb_release -a"
will give an error code because CODENAME info is not present.
As such, bitbake will extract the info from /etc/lsb-release,
running into the above issue.
Consequence is that building under BA will crash.
Partial fix for [YOCTO #4071]
(From OE-Core rev: 5d0839bef631dceb4395fcf204779a76966a1061)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Paul Eggleton
Rogerio Nunes
Bogdan Marinescu
Felipe F. Tonello
Martin Jansa
Kevin Strasser
Mark Hatle
Otavio Salvador
Andreas Müller
Cristian Iorga
Takeshi Hamasaki
Jeff Polk
Bruce Ashfield
Richard Purdie
Khem Raj
Laurentiu Palcu
Andrei Dinu
Marko Lindqvist
Björn Stenberg
Marc Ferland
Kang Kai
Chen Qi
Joe Slater
Stefan Herbrechtsmeier
Anders Roxell
Ross Burton
Zhenhua Luo