New GLib doesn't require glib-2.0-native to build itself so remove it from the
DEPENDS. However it is needed for the test suite so respect PTEST_ENABLED and
add it to DEPENDS if required.
(From OE-Core rev: 216d534258f4fd7aa3c46093aba6fa2967ae5283)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise QA check will fail.
Some schemas in gsettings-desktop-schemas (such as proxy and locale)
are still using deprecated paths, as of 3.16.1. This causes warning
messages, and meta/lib/oe/rootfs.py complaints about them.
(From OE-Core rev: 751c8388c7f7584460bbf0c0f1d61e47372717af)
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>
Removed 0001-GListModel-roll-back-use-of-type-redefinition.patch since
it is a backport patch.
(From OE-Core rev: 4c91238d0b7089186a8ec5f65b97afc7f361e16b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backported a patch to fix build on CentOS' gcc 4.4.7:
0001-GListModel-roll-back-use-of-type-redefinition.patch
(From OE-Core rev: c93394277ab11ed0efe3a777c9e5d818762fdc9e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It doesn't have a homepage except gtk.org, use its reference manual page
as the homepage, which we can easily know whether it is a stable version
or not.
(From OE-Core rev: ef303442278c900cd6bfd529692cb9de80e31353)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently a USB stick gets mounted on /run/media/sdX, where X is the
letter corresponding to a certain drive. In older builds of core-image-sato
it got mounted in /media/sdX. This change made the drives to not be
displayed in graphical applications which use glib-2.0 such as the
File Manager (pcmanfm). The reason is that the gio component of glib-2.0
which handles mounts contains a function which determines if a mount
is worthy to be displayed in the UI or not. The function is called
g_unix_mount_guess_should_display().
It expects a drive to be mounted in /run/media/<username>/sdX, but
in the current build the username part is missing in case a root user
is authenticated in the system.
The easiest solution is to allow the display of drives mounted in the
path used by the current configuration and that is /run/media/sdX.
[YOCTO #6492]
(From OE-Core rev: da9bbcd2233057a0529005b9b2cc34aff65bc6e2)
Signed-off-by: Marius Avram <marius.avram@intel.com>
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>
change use of eglibc related variabled to glibc equivalents
(From OE-Core rev: fd15d6e0c8da75951a91d4467eda23c229b1026d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This override overrides the gettext class additions so we need to
add back the dependency manually.
(From OE-Core rev: 1f7d22ce9322b960c89afd3673ace9f0d937b2a6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
mingw and darwin builds need to change the value of printf from no
to yes. Whilst you can do this from a bbappend, its currently a bit ugly
and assumes knowledge of the other conf arguments. Fixing this in the glib
recipe directly is cleaner in this case.
(From OE-Core rev: ba37c147e82e6466030cf40a9e86442ac7592185)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This isn't built/present under mingw builds so make installation
conditional upon its presence.
(From OE-Core rev: 53903afae4fe841c0d394172201660d5e3fad5d4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The test suite is installed into ${libexecdir} and as that may be outside of
${libdir} the QA test needs to be silenced.
(From OE-Core rev: d354d339a38d22f1a5bca14341229d2282647fbb)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The tests are installed to $libexecdir not $libdir/glib-2.0. By default these
are the same location but they can be changed independently.
(From OE-Core rev: 73d774fa7456842690af95206b77162d5f1bcb37)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Do not use readlink to set ABS_GLIB_RUNTIME_LIBDIR when cross
compiling. Doing so causes host paths to potentially pollute the
target. Unfortunately in this case we don't actually convert to
an absolute path.
(From OE-Core rev: 2eb434ec298c279846ddd535a7122986558eb2c8)
Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The patches Fix-Werror-format-string, gio-test-race, gtest-skip-fixes, and
ptest-dbus have all been merged upstream.
Two license checksums changed as upstream has updated the FSF address in those
files.
(From OE-Core rev: b755139b8112b425ff0a21f121104b7d212e7143)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some classes of recipe disable ptest even though its in DISTRO_FEATURES
(e.g. nativesdk). We shouldn't attempt to build ptest packages when
its disabled. This replaces some DISTRO_FEATURE checks with PTEST_ENABLED
checks instead.
(From OE-Core rev: 8b14fcc62f31bbbb231790136cdb984db96d9ba9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Address the error
| checking for ZLIB... no
| checking for inflate in -lz... no
| configure: error: *** Working zlib library and headers not found ***
by ensuring zlib-native is in DEPENDS.
[YOCTO #5773]
(From OE-Core rev: f7fd641c13543f0df412fe0ff01238734ddbbaff)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
DATADIRNAME is used by many applications using autotools
to install locale data, we get a wrong value for uclibc
systems since it does not recognise it as proper linux
systems and start putting locale info in /usr/lib instead
of /usr/share
(From OE-Core rev: 7897ab5f54d2dc21795b2a53b82b9c911157f0ca)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is a race condition in the makefile that can result in build failures like
this in parallel builds:
| ./gdbus-test-codegen-generated.h:7:0: error: unterminated #ifndef
| #ifndef __GDBUS_TEST_CODEGEN_GENERATED_H__
Fix the rules to stop this happening.
(From OE-Core rev: 97ccd2b841c9dc598dbe39162f335bcde48a7c26)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch from upstream to fix skipped tests, essential for gdk-pixbuf to
pass without enabling all loaders.
(From OE-Core rev: 4bf996557409b63c2d783f175c6325c966aae236)
Signed-off-by: Ross Burton <ross.burton@intel.com>
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>
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>
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>
The uclibc configuration requires the gnu libiconv, so tell configure which one to use
[YOCTO #5431] (one of many)
(From OE-Core rev: a90b32d63c8a816462b42a33851e4e5e6041bbca)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit 38b6c4df7c215ed7fd6be107fbc2527e66791e2e.
Its not needed anymore after upgrade to 2.38
(From OE-Core rev: 3efd8530053cf54e3f0b0fc6a96272fdb2ee27ba)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The .bb was getting larger with configuration being arbitarily split between .bb
and .inc. To help adding a glib_git recipe, strip the .bb down to SRC_URI.
Also don't remove $libdir/gio as it should be owned by glib.
(From OE-Core rev: 55b950500fd9d944042e3c2b0872685f0a60e8eb)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop the ptest patches and instead use --enable-installed-tests, updating
run-ptest to invoke gnome-desktop-testing-runner.
Drop the x32 build patch, upstream has integrated a similar fix.
(From OE-Core rev: 33bb8d5da050519043bb913bae4f5692bbd899ad)
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>
With buildtools (which contains Python) installed on a build machine,
glib-2.0's gtester-report script was ending up with the full path to
the installed python binary in the shebang, which when rpm packaging
was used led to this being added as a per-file dependency by rpmdeps for
the libglib-2.0-utils package in which it ends up. This of course broke
do_rootfs when the package was included in the rootfs and had been
restored from sstate from another machine, as happened on the Yocto
Project autobuilder.
We were already trying to sed this script apparently only for the
shebang (since it appears that there are no other paths in the script)
so let's just sed the shebang properly; it also seems sensible to do
this for native as well instead of explicitly trying to exclude that
case.
Fixes [YOCTO #5205].
(From OE-Core rev: 1d16e8035dda062041394b1e51839a9a7d077cf5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We will see the following warning by accident:
$ bitbake nativesdk-glib-2.0
WARNING: QA Issue: nativesdk-glib-2.0-dbg: found library in wrong location:
/opt/poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/share/gdb/auto-load/opt/
poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/lib/libglib-2.0.so.0.3600.4-gdb.py
There are two '/opt/poky/0.5.5/sysroots' in the path when the warning
comes, this is what we need since glib-2.0 has done this intentionally
in its configure and Makefile.
This is because the configure script uses the:
ABS_GLIB_RUNTIME_LIBDIR = "readlink -f $libdir/$with_runtime_libdir`"
to figure out the abs dir, so if
/opt/poky/0.5.5/sysroots/x86_64-pokysdk-linux/usr/lib/ exists , there
would be warning, otherwise no warning.
We can change the "readlink -f" to "readlink -m" to fix the host
contamination issue.
Another fix could be:
ABS_GLIB_RUNTIME_LIBDIR =""
But this is much more like a workaround.
[YOCTO #5099]
(From OE-Core rev: 3e660ec01cc62c57b379b151e43c7952e97a1c2b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We use GNU libiconv seprate package on uclibc
specifying this makes the configure clear of not
trying to detect glibc/iconv and then also finding
libiconv in sysroot and confusing itself with errors like
| gconvert.c:66:2: error: #error GNU libiconv not in use but included iconv.h is from libiconv
| #error GNU libiconv not in use but included iconv.h is from libiconv
| ^
(From OE-Core rev: 38b6c4df7c215ed7fd6be107fbc2527e66791e2e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
glib configure will check if current gcc need -march=i486,
when gcc need -march=i486 but CFLAGS don't have,
glib configure will abort and advise the user to add -march=i486.
This will break the build process,it's not good for automatic build system.
so change this to adding -march=i486 automatically when it is needed.
(From OE-Core rev: fdd523e5a14cacf31dce4dae435267e30dff9222)
Signed-off-by: Song.Li <Song.Li@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patching a generated file is prone to conflicts, and we'll be replacing this
file anyway when configuring, so drop the Makefile.in hunks.
(From OE-Core rev: a3fa323c4d24375be9b783281c3cf31c0707ecb7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch was build- (gcc 4.7.2/4.8.0) and run-tested with my standard
xfce-/gnome2-images
(From OE-Core rev: f4f5d41f6cd262379daa8a00699a64f0df6fd9e7)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since 2.20 the use of argparse was removed, so we don't need these dependencies
anymore.
(From OE-Core rev: 2a6067f6e69c8f2d04b8cf7e4a97e5085f758654)
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>
Remove automake patch that is now correctly supported upstream
Codegen files have moved to glib-2.0, so correct packaging and
removal.
(From OE-Core rev: 0d13d9947262b09cd69bc526ea2738e50c658744)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this, glib will probe for the existence of xsltproc and use that
to decide whether or not it wants to generate manpages. This has two
consequences, neither of them good:
a) the result of the build will vary depending on whether xsltproc
happens to be installed in either the native sysroot or the host
environment; and
b) if xsltproc does happen to be installed but docbook-xsl isn't, the
build will fail with "I/O error" messages.
(From OE-Core rev: b2e2c6e1a20ea4c53dea04992bb1b38890a959dd)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Alexander Kanavin
Ross Burton
Jussi Kukkonen
Robert Yang
Marius Avram
Khem Raj
Richard Purdie
Drew Moseley
Otavio Salvador
Saul Wold
Cristian Iorga
Riku Voipio
Paul Eggleton
Marko Lindqvist
Jackie Huang
Andreas Müller
Phil Blundell