Commit e0c2dd275827a4b37b8116d0f0119333638461af broke building
eglibc 2.17, which still ships pt_chown under eglibc/ directory.
Fix by only deleting directory when pt_chown is not there.
Cc: Khem Raj <raj.khem@gmail.com>
(From OE-Core rev: 10722a37bb7efa563425a7389100b9322d96492e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
eglibc 2.18 has now been branched out so point to new
tarballs
(From OE-Core rev: e0c2dd275827a4b37b8116d0f0119333638461af)
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>
If USE_LDCONFIG is not set then we won't ship ld.so.conf. However,
eglibc still installs it which leads to a QA warning. Prevent that by
removing the file (and the subsequently-empty directory /etc) in this
situation.
(From OE-Core rev: 23b5dd2ab8a556fcef3aa34689310d9d5f61b3d1)
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>
* PROVIDES_${PN}-dbg doesn't look correct, it should be RPROVIDES
and that was already in eglibc-package
* RPROVIDES_${PN}-dev was overwritten in eglibc-package, but add
those 2 entries now
(From OE-Core rev: 2edf614729a71f9ec15d00eeeea557a97e673284)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Not every external toolchain has mtrace/sotruss/xtrace scripts so check
their existance first.
(From OE-Core rev: 06ea50973a4446053d1ecac5b8e4cf425c8df5b1)
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fixes error in world-image build:
* check_data_file_clashes: Package eglibc-doc wants to install file
rootfs/usr/share/info/dir
But that file is already provided by package * gcc-doc
(From OE-Core rev: f6e0875e35b9149f38f3bbfab6bd7a26048dd689)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This removes the dependency of eglibc.bb itself on perl and bash
which, in turn, eliminates the need to build those two recipes if the
scripts which need them are not going to be installed.
Also provide dummy do_evacuate_scripts() for all variants of eglibc-initial
otherwise the nativesdk and multilib variants might crash trying to
copy a non-existent mtrace script.
(From OE-Core rev: 74b5f8943b2b29c7b3b62be7d81fb2b3a86b9584)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This avoids the hardcoding of ${libdir}/locale which is all over the place,
and will facilitate use of ${exec_prefix}/lib/locale instead of
${libdir}/locale.
This doesn't actually change any output at this time. Verified this with
buildhistory against the packages produced from core-image-base.
(From OE-Core rev: b744f4cc2912334b8493a89525fd02af8e9b8edf)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 13544fbc6217fee1731a6da1e2cf94901a500842 changed the ordering
of PACKAGES so that ${PN}-dev came before ${PN}. However, this caused
the FILES matching to go wrong if ${libdir} == ${base_libdir}. Fix this
by moving ${PN} ahead of ${PN}-dev once again.
(From OE-Core rev: ec3ec1e7388c2175f41527d5e5e07c6bb14a8f6e)
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>
The /usr/include/rpcsvc/rquota* files are provided by both eglibc
and the quota package. Quota's version is newer and a superset of
eglibc's
[YOCTO #238]
(From OE-Core rev: a155eee07dc8eb369ae897b702a14826e370bf5a)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.
By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.
(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Both eglibc-locale and eglibc were installing locale files into the sysroot.
Whilst this is in general harmless, its a waste of diskspace/time so this
moves the responsibility to the eglibc-locale package.
No PR bump this this is really a cleanup and doesn't affect build output,
the sstate size reduction will happen next time it is rebuilt.
(From OE-Core rev: e9bf694b635baab9238088fbeb5d2d67e9190ccd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Many recipes are now having to define PERLPATH and PYTHONPATH variables.
Creating USRBINPATH in bitbake.conf means we can remove all these lines
from the many recipes now needing this and simplify the code changes
needed in each case, reducing the chance of errors being introduced.
Also fixup glib python binary location issue and fix function indentation.
(From OE-Core rev: cf63d9068c3a8c635dfc240d30dfff278be9b0e2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
add libc-mtrace as dependency for task-core-tools-debug
now eglibc-mtrace gets included in an sdk image and not in a non-sdk image.
This does not affect builds with uclibc.
This fixes bug: [YOCTO# 2374]
(From OE-Core rev: a2ad2870a54108027ed33e977470f5f72e0bce1b)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a newly installed directory and Makefile that is not needed
in an embedded setup
It fixes:
ERROR: For recipe eglibc, the following files/directories were installed but not shipped in any package:
ERROR: /var
ERROR: /var/db
ERROR: /var/db/Makefile
(From OE-Core rev: 35b5fb2dd2131d4c7dc6635c14c6e08ea6926457)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Generally distros keep perl at /sur/bin/perl
Fedora 17 alpha also has /bin/perl
this causes eglibc build on such distros to put perl interpreter path in
the perl scripts as /bin/perl
But we set perl location for target as /usr/bin/perl
This mismatch of perl path causes failure of rootfs image creation
like this:
| error: Failed dependencies:
| /bin/perl is needed by eglibc-utils-2.13-r23+svnr15508.i586
NOTE: package core-image-sato-1.0-r0: task do_rootfs: Failed
ERROR: Task 8
(/home/nitin/prj/poky.git/meta/recipes-sato/images/core-image-sato.bb,
do_rootfs) failed with exit code '1'
This Fixes bug : [YOCTO #2286]
RP: Updated to better account for -nativesdk
(From OE-Core rev: 381bf0d364da5970682502f8f124264907587b87)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:
sed \
-e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
-e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
-i `grep -ril getVar *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
WARNING: For recipe eglibc, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib/locale
(From OE-Core rev: d8c24378c6813036fcf9bc88cac919c3443c1446)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add sanity checks that test for the existance of folders. This allows to use
an external binary toolchain that doesn't have localization support.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit 974cdb88680359aac5aefd11b84c4a374ab3a753.
See the mailing list for details, this broke things for too
many people such as where PKGSUFFIX is used in PREFERRED_PROVIDER.
odified: meta/recipes-core/eglibc/eglibc-locale.inc
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
eglibc.inc contains packaging rules that depend on PKGSUFFIX expansion.
However that variable wasn't expanded properly in some case. E.g.
PACKAGES = " ... nscd${PKGSUFFIX} ..."
FILES_nscd${PKGSUFFIX} = "${sbindir}/nscd*"
would be expanded to
PACKAGES = " ... nscd-nativesdk ..."
FILES_nscd = "${sbindir}/nscd*"
Thus leading to empty -nativesdk packages and missing files. To overcome
that use python code blob to properly define PKGSUFFIX variable.
(From OE-Core rev: 974cdb88680359aac5aefd11b84c4a374ab3a753)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
RPM checks to see if binaries require GNU_HASH, if they do it adds
an automatic dependency of "rtld(GNU_HASH)". We need to satisfy
this dependency, and we do it by providing rtld(GNU_HASH) in the
package(s) that provide a runtime-linker.
(From OE-Core rev: e150afea5a9af8e1bc5aaecd9eb3fe86d7b79f44)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There are no locales resources in an lsb image because the locale resources were splitted from eglibc-package.inc \
and putted into a new file "eglibc-locale.inc". So the above variables lost their function in eglibc-package.inc and
caused no locale resources in an lsb image. The purpose of moving the above variables from eglibc-package.inc to \
eglibc-locale.inc is to make the above variables to take effect.
eglibc-binaries include packages "eglibc-binary-*"
eglibc-localedatas include packages "eglibc-localedata-*"
eglibc-gconvs include packages "eglibc-gconv-*"
eglibc-charmaps include packages "eglibc-charmap-*"
(From OE-Core rev: 0903a2c62a58f94b7d424162e8c852b502d3840a)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gconv is directory so test -f was always false as reported by Phil Blundell in
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-August/008973.html
* -e used also for localedef which is file, just to be more consistent
(From OE-Core rev: feaf1bab56138cc1bc998a4201a60202a5b8cd28)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This fixes warning messages such as:
The providers found were: ['virtual:nativesdk:eglibc_2.13.bb', 'eglibc_2.13.bb']
The PREFERRED_PROVIDER entries resulting in this conflict were: ['PREFERRED_PROVIDER_virtual/libc-nativesdk = eglibc-nativesdk', 'PREFERRED_PROVIDER_virtual/libc = eglibc']
NOTE: multiple providers are available for runtime glibc-utils (eglibc, eglibc-nativesdk, external-csl-toolchain, external-poky-toolchain)
NOTE: consider defining a PREFERRED_PROVIDER entry to match glibc-utils
This highlights how ugly adding to PN is when using BBCLASSEXTEND. We need to do this to
eglibc so the nativesdk class continues to work correctly for now and ensure consistency
in how the various eglibc packages are generated.
Longer term, if we switch nativesdk to use the multilib approach and MLPREFIX, we can
remove all the PKGSUFFIX mess. I'd rather not get into changing nativesdk right at this
time though given all the other changes that are going on.
(From OE-Core rev: 3a18aa65a4c123ea922b6cd09ca6a77090f12252)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
in eglibc-package.inc, the "PACKAGES" variable use the ${PN} reference,
while RPROVIDES does not use ${PN}. This will lead multilib.bbclass
not mapping its RPROVIDES, and cause "NO RPROVIDER: lib64-glibc-utils"
error.
This patch unify the recipe to fix this issue
(From OE-Core rev: 37ff0fea8f7180b1a9d91d24dfe1735730427497)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Due to mismatches between various header definitions in i386 and x86_64
we need to overwrite the i386 versions of the headers with their x86_64
equivalents.
This can not be done for the syscall.h as it's dynamically generated,
so use the header conflict resolution helper for that.
(From OE-Core rev: 019a33236f76aacb989e8f37b09b81599c27f296)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* in some cases we don't have localedef/gconv built
ie when DISTRO_FEATURES lacks one of libc-charsets, libc-locales, libc-locale-code
then is better ignore localedef/gconv instead of do_install_locale
failing like in this bugreport:
http://bugzilla.yoctoproject.org/show_bug.cgi?id=1209
(From OE-Core rev: 5486cac29db6e67051fff7637a0abc9aeab661e5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Similarly to libnss*, if ${libdir} and ${base_libdir} were the same path then
libthread_db would land in ${PN}-dev rather than the intended place. As before,
fix this by moving eglibc-thread-db earlier in PACKAGES and adjusting its FILES
to not capture the .so symlink.
Bump PR for both 2.12 and 2.13.
(From OE-Core rev: a4824eb8b04c6397e5398c0c4f0428daded8e42e)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes these package QA warnings:
WARNING: For recipe eglibc, the following files were installed but not shipped in any package:
WARNING: /etc/localtime
(From OE-Core rev: 9070c91c1242ec5ea8a8c7f0dd4cf40e8ce59221)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously, libnss_hesiod et al. could get swallowed by the wildcarded glob in ${PN}-dev.
Fix it by moving eglibc-extra-nss earlier in the PACKAGES and adjusting its FILES to ensure
that the devel symlinks don't get caught.
(From OE-Core rev: 585e46e089e8863c8970a9c7c02159805e3e479a)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #1214]
The eglibc-utils contains 2 scripts (tzselect and xtrace) that use
bash, so add an RDEPENDS to eglibc-utils.
This also removes libsotruss as it's currently not built, it was
not previously depended on because it was mis-spelled as "EDEPENDS"
(From OE-Core rev: e2f19080954c90188d27508bda4e8493e9ede12c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise the following "mv ${libdir}/gconv" fails because the destination
has already been created.
(From OE-Core rev: f825e4ca619d3dc9c650343327a753eeb4a50e51)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 477ede7472db0bacd5daacb96e97f849d1be84ee accidentally reverted
some code changes it shouldn't have done leading to continued eglibc
packaging issues. This patch corrects that damage.
(From OE-Core rev: b0dd8f5e71e33bdc2614133a7cbb21426ecee38d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libc-{common,package}.bbclass: fix shlib renaming for the C library
Without this you'd end up with eglibc_2.12.ipk instead of libc6_2.12.ipk as before
* eglibc-locale: don't make versions go backwards after split from eglibc
eglibc was way beyond PR = "r1" at the time of the split, so increase PR to make package upgrades work
[RP: Fixup PR merge conflict]
(From OE-Core rev: 477ede7472db0bacd5daacb96e97f849d1be84ee)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These changes ensure files packaged in the -locale package aren't included
in the main do_install and also ensures the staging directory used for
the -locale package doesn't end up in the -dev package.
(From OE-Core rev: 2dccb370e04bc2bbe208b2b0541077d8ef519535)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
*libc's do_package will cost a lot of time due to the locale handing,
which may delay the other recipe's do_package task and affect the build
performance.
This commit moves locale handling into a separate recipe *libc-locale.
[RP: Add fixup with recent eglibc commit conflict for FILES_pn-dbg and PACKAGES]
(From OE-Core rev: c6d3242f7642f537b02870bb4eb650f0e2094b85)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2.14 has a new utility which can trace through PLTs of shared libraries
We package the library separately and the script is already packaged in
eglibc-utils so we create a RDEPEND so that the library is pulled in
if someone isntalls eglibc-utils
(From OE-Core rev: b8c7249e10a7bba329f1977529c7bde6b969f729)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The glob for libc_baselibs was too permissive, causing some of the libcidn
symlinks to be placed in ${PN} rather than the intended subpackage. Worse,
the .so itself was actually landing in ${PN}-dev, so the net effect was to
make libc6-dev a dependency of libc6.
Bump PRs for both 2.12 and 2.13 as a result.
(From OE-Core rev: b41a9d1b536ffef5f86dac40f34b44db463a1038)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The purpose of adding the above variables it to make it easier to
install them into a lsb-image. By having 4 collections of packages
they will not fill the task-poky-lsb.bb file.
eglibc-binaries include packages "eglibc-binary-*"
eglibc-localedatas include packages "eglibc-localedata-*"
eglibc-gconvs include packages "eglibc-gconv-*"
eglibc-charmaps include packages "eglibc-charmap-*"
[sgw: edited summary and description]
(From OE-Core rev: d8c985ec67f39a9e4ba9afbb0b52c2fe7e632255)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Riku Voipio
Khem Raj
Phil Blundell
Martin Jansa
Marcin Juszkiewicz
Phil Blundell
Christopher Larson
Saul Wold
Richard Purdie
Nitin A Kamble
Ken Werner
Dmitry Eremin-Solenikov
Mark Hatle
Xiaofeng Yan
Lianhao Lu
Yu Ke
Koen Kooi
Dongxiao Xu
Richard Purdie