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>
Currently, tow successive toolchain builds for different hosts, will
issue a warning:
WARNING: The recipe nativesdk-packagegroup-sdk-host is trying to install
files into a shared area when those files already exist. Those files and
their manifest location are:
/ssd/work/yp1/build/tmp/deploy/ipk/all/nativesdk-packagegroup-sdk-host_1.0-r11_all.ipk
Matched in manifest-x86_64-nativesdk-packagegroup-sdk-host.package_write_ipk
Please verify which package should provide the above files.
That's because packagegroup is manually inherited after nativesdk which
is usually a BBCLASSEXTEND operation, done last.
[YOCTO #5396]
(From OE-Core rev: 7621a40d24f3e53b373f233e070894e4afc2b4b2)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some of the GLib tests that we run under ptest are missing runtime dependencies.
iochannel-test needs the EUC-JP encoding.
convert needs the ISO-8859-1 and ISO-8859-15 encodings.
contenttype needs shared-mime-info.
Add these to the RDEPENDS so that these tests pass.
[ YOCTO #5696 ]
(From OE-Core rev: 7b6316093ab28782edd45084d43dbd5c309be7c8)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* do not depend by default
* depend on virtual/mesa instead of mesa
(From OE-Core rev: d8d02cb15f9d64f0e773223965e3ff6b6ae0874f)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 tree to the 3.10.25 korg -stable release.
(From OE-Core rev: 85ec7e0bb1306b3ac3506627a3aa04a42c0ec180)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta SRCREV to import the following changes:
d9cd83c0292b remove old MEDIA config fragments
06b76256d7e2 common-pc-standard.scc: Enable USB webcam support
acb8b43837d8 common-pc-64.scc: update as per changes in the media config fragments
5513fd2ad72a minnow-standard.scc: Enable media features
172ba799bedc media-all.scc: A feature including all the media features
1a7e1d3a292e media-platform: A feature for platform media devices
03c48dacbb9a media-dvb-frontends : A feature for Digital Video Broadcast Devices
59b92b9d6c72 media-usb-tv: A feature for USB TV media adapters
5ec0709b1fed media-tuners: A feature for media tuner devices
356dc83e39f3 media-rc: A feature for remote control media devices
89d96cf9d574 media-radio: A feature for AM/FM radio devices
3dd2ebeaf49b media-pci-capture: A feature for PCI media capture devices
9ee0e95bfc52 media-i2c: A feature for I2C media devices
28976f4a3e27 media-usb-webcams: A feature for USB media devices
f8206f4e00b1 media: A feature for media infrastructure
08bfb248a17f standard.scc: Add firmware loading feature
e567a3d53593 firmware: A feature for firmware loading support
(From OE-Core rev: f4b00c4ddf1efb2a728b7a08b542c9c7254c787f)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is a Makefile dependency race causing occasional build failures:
*** No rule to make target `.../work/core2-poky-linux/ltp/20130904-r0/git/testcases/kernel/include/linux_syscall_numbers.h.23161.sh', needed by `linux_syscall_numbers.h'. Stop.
This is due to a bad dependency wildcard that is matching more than the one file
it should match, so replace it with a concrete filename.
(From OE-Core rev: 639ecfb578ff926f5deddb984f4f8600e161e22a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dnsmasq recipe in meta-networking ships a dnsmasq.service file, that will
correctly override the SysV init script. Thus, as pointed out by Ross Burton,
we should remove dnsmasq from the list.
(From OE-Core rev: 69a8153c55bf74fa6178d6bd65ac8e761c041a0e)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use 'poweroff' instead of 'halt' for the Exec field in the shutdown.desktop.
The purpose of this patch is to make the 'shutdown' icon on on our sato
images work as expected for both sysvinit and systemd images. Previously,
the Exec field was 'halt'. The `halt' command could poweroff the system
in sysvinit images but it only could halt the system in systemd images.
The difference is due to the different implementations of the `halt' command.
In sysvinit, the `halt' command will effective execute `/sbin/init 0'. This
is for the compatibility with sysvinit 2.4, as stated in the comments of the
source code. In systemd, the `halt' command will effectively execute the
reboot(RB_HALT_SYSTEM).
As the 'shutdown' icon is expected to actually shutdown the system, we should
use poweroff instead of halt for its Exec field.
[YOCTO #4347]
(From OE-Core rev: c87d44a079c13a98734f9f726ec1b55d86793f8c)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Explicitly disable systemd support so that it isn't a floating dependency and
libsystemd-login doesn't become a runtime dependency on non-systemd images.
Also don't bother setting the systemd unit directory as we're not installing
anything.
(From OE-Core rev: 4f5d00b551e2ee6056ebfc8365a05a5ca8e5d651)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patch application failed on the autobuilder for pam, this refresh of the
patch should resolve the build failure.
(From OE-Core rev: c4c5ec52effc2ff97ac17270c1aa7884c808f5a9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Nose is installed as an Egg by default which we don't want, so change the
inherit to setuptools from distutils to disable the eggification.
(From OE-Core rev: 47a07c42f5f67dcf69f844531f7a527029e6280e)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The binaries:
-rwxr-xr-x root/root 21956 2014-01-09 19:39 ./bin/hb-shape
-rwxr-xr-x root/root 21504 2014-01-09 19:39 ./bin/hb-ot-shape-closure
-rwxr-xr-x root/root 36520 2014-01-09 19:39 ./bin/hb-view
are not generally useful on target systems. Also, their presence in the
same binary package as libharfbuzz.so defeats the debian package autonamer.
Inherit lib_package to move these to ${PN}-bin.
(From OE-Core rev: d716f63d5785fa9239497d25bffc5035a9e58d28)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Respect the OpenGL distro feature and if it's enabled, pull in piglit and
mesa-tools.
(From OE-Core rev: cd61c62ed30694eeb82e88e058a3a3e1bfb06f78)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Piglit is an OpenGL testing tool. This recipe is taken directly from meta-oe.
(From OE-Core rev: cab8dad6f3b14f21115a765a4e55d38a0f73f337)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Waffle is needed for Piglit. This recipe is based on the recipe in meta-oe,
upgraded to the latest upstream 1.3.0.
(From OE-Core rev: 67228f682cb8acc71dd5f8b44af67f529727f780)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python-numpy is needed for Piglit. This recipe is taken directly from meta-oe.
(From OE-Core rev: 9bf355cceaec6ebacdcbcc35f9713ff73e1c85da)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python-nose is a build dependecy for python-numpy, needed for Piglit. This
recipe is taken directly from meta-oe.
(From OE-Core rev: 6b0c3e9955292d2ea13c6871c686824cd04150f1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python-mako is needed for Piglit. This recipe is taken from meta-oe, and
upgraded to the latest upstream version.
Checksums updated as the upstream LICENSE file contains the copyright dates.
(From OE-Core rev: 1ad759508d834f3bcb3bb8542ae2012a2b6ef2e0)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Specify the full set of install paths (bindir, libdir, etc) for packages that
use the GNUInstallDirs module, instead of just the prefix and leaving the rest
as default (which breaks with multilib).
(From OE-Core rev: d3995ac14ba05c0420f15f264f7e9d0c3af71f74)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The changes to cmake make this unneeded now.
(From OE-Core rev: 92472980b816ee9ada502c1965976cb6eedc0a27)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
grub-2.00-disable-help2man patches configure.ac to disable the help2man check
because we don't need the man pages. It also then patches configure itself so
that autogen.sh doesn't have to be called for performance reasons. However,
do_configure causes a full autoreconf so this optimisation is moot, and can
cause patch failures when an existing build tree is re-used.
Instead, simply use CACHED_CONFIGUREVARS to tell configure that it can't find
help2man.
(From OE-Core rev: 34b9b2931da1fbf4c68a3e35f4ca56553058574b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There should be only one automake under the STAGING_DATADIR_NATIVE in
theory, but der_steffi@gmx.de has reported an odd problem which seemed
like that there are more than one. However, the "automake
--print-libdir" is the regular way to locate automake libdir.
[YOCTO #5706]
Reported-by: der_steffi@gmx.de
(From OE-Core rev: 59f46f9c9f8a36d8829b9b33291249a7b92ebcac)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The cross-canadian packages were split into their own package group
some time ago. These two are leftovers and can be safely removed.
(From OE-Core rev: 0f05393bad8ac84627f339aa1619c96c22d2dc37)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Unfortunately d.keys is extremely slow. Using a list in this case should be
fine since the addtask lines are immediately above the code and aren't
going to change often.
(From OE-Core rev: 5901189f0442cefc4d17623547f7358ffc2d37a6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The dependency here needs to apply for nativesdk as well as target packages
as the autobuilder just tripped over that. We'd never want a native version
so I'm not sure why the target class override was even present. The dependency
also applies to do_package so lets be explicit about that in case sstate
decides to get clever.
(From OE-Core rev: b7ec21ac8ebac9d7fba34d6f11d93ecb8f561ca8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This makes builds of make deterministic.
(From OE-Core rev: 9ab5e5f16cb485f8838ba886216912a78cee01e2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lz4-native is needed for kernels using lz4 compression, which was merged in 3.11.
Lz4 has a similar compression rate to lzo but decompresses a lot (>4x) faster.
(From OE-Core rev: 13e5da254529716b0445895d70b40489ce22941b)
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Set B=${WORKDIR}/build in cmake.bbclass so that recipes using cmake.bbclass do
out-of-tree builds by default.
(From OE-Core rev: 783fb88f476c94d5d4f4b954f7053464d9a6dff5)
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>
Instead of the class-specific variables OECMAKE_BUILDPATH and
OECMAKE_SOURCEPATH, just use ${B} and ${S}.
If these two paths are different, delete any existing ${B} before running a
build so that previous builds don't taint the current build.
Note that OECMAKE_SOURCEPATH and OECMAKE_BUILDPATH are not respected, so recipes
that manually set these in the past will need to be updated to either use
something along the lines of separatebuilddir.inc or set B themselves. If the
old variables are set, a warning is displayed.
(From OE-Core rev: 43073569cb67d98c11aa71211d77b566b64f9145)
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>
Drop the 2 patches since the functionality is upstream now.
Also sync PACKAGECONFIG with grub 2.00 recipe.
The debugedit problem for 64 bit machines in do_package is still present, though:
ERROR: debugedit failed with exit code 256 (cmd was '/build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit' -b '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux' -d '/usr/src/debug' -i -l '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/debugsources.list' '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module'):
/build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit: /build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module: Unhandled relocation 258 in .debug_info section
ERROR: Function failed: split_and_strip_files
ERROR: Logfile of failure stored in: /build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/temp/log.do_package.29234
ERROR: Task 10 (/build/linaro/build/openembedded-core/meta/recipes-bsp/grub/grub_git.bb, do_package) failed with exit code '1'
(From OE-Core rev: cd29ff3927a6deae5e808525bd56acf7b4b0b60c)
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Delete patches that have been applied upstream or are no longer necessary.
Update LIC_FILES_CHKSUM to match new COPYING (whitespace changes only).
(From OE-Core rev: 7c3b070b9cdd8b1d564d8900858cd31d11b20e6f)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Matthieu Crapet
Krzysztof Sywula
Richard Purdie
Andrew McDermott
Saul Wold
Laurentiu Palcu
Ross Burton
Andreas Müller
Bruce Ashfield
Anders Darander
Chen Qi
Phil Blundell
Robert Yang
Koen Kooi
Yasir-Khan
Zhang Xiao