| Age | Commit message (Collapse) | Author |
|---|
|
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>
|
|
During SDK generation the multilib_sanity_check function is being called,
however it is not available unless we've been called from the image.bbclass.
Disable the check if MULTILIB_CHECK_FILE (also set in image.bbclass) doesn't
exist or is empty.
(From OE-Core rev: 0611cceca1595ea4656ebcb985cbd92bb9774ec8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
In order for things to be easier to maintain in the future, sync up
the sdk and rootfs versions.
(From OE-Core rev: 3c78da15457d8d20c9964cd845f6e021d442aaae)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Add SDK_PACKAGE_ARCHS to avoid the sed operations we were previously doing
inside of the variouns populate_sdk functions and related items.
Also add documentation to populate_sdk to explain when the various functions
are expected to be doing.
Finally fix a bug in populate_sdk_rpm where the wrong value was being set,
noticed while working on this change.
(From OE-Core rev: 587c1d5bac71fa6faa65ee3a271391cbf931e8f7)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
in packages_rpm.bbclass:
Cleanup the way package_update_index_rpm works. Break this out into two
functions, one for common functionality and one for controlling target vs
sdk package processing.
Similar change to package_generate_rpm_conf.
Usage of IMAGE_ROOTFS should actually be "target_rootfs", this fixes a problem
with the SDK case.
in rootfs_rpm.bbclass:
Minor re-order of the values, and avoid multiple uses of IMAGE_ROOTFS in order
to make the merge with the SDK behavior easier.
(From OE-Core rev: 46559f36d8a39655060b45d3d235de44a2c4c09b)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
arch all 1
arch any 6
arch noarch 11
arch arm 16
arch armv4 21
arch armv4t 26
arch armv5 31
arch armv5t 36
arch armv5-vfp 41
arch armv5t-vfp 46
arch armv5e 51
arch armv5te 56
arch armv5e-vfp 61
arch armv5te-vfp 66
arch armv6-vfp 71
arch armv6t-vfp 76
arch armv7-vfp 81
arch armv7t2-vfp 86
arch armv7a-vfp 91
arch armv7at2-vfp 96
arch armv7a-vfp-neon 101
arch armv7at2-vfp-neon 106
arch beagleboard 111
Which leads to a failing do_rootfs
(From OE-Core rev: 2a41a311ddda11713296391050f3c2c1b2c1d3d3)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
fix the MLPREFIX referrence typo which cause multilib rpm
do_rootfs failure
CC: Mark Hatle <mark.hatle@windriver.com>
(From OE-Core rev: 9653089620ad5aef7876b582708561c3a315a064)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: 5e22d7d1fea7dfb14380de5692e4b2940781b518)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Earlier iterations of the multilib patch used "TUNENAME", which was later
renamed to DEFAULTTUNE. This file was missed in the rename.
(From OE-Core rev: fdd39925df8268ad41c1ff643a0761b03fad8e08)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Its possible we get duplications if we explicity add TUNE_PKGARCH to
PACKAGE_ARCHS so instead just add a sanity check to verify it.
(From OE-Core rev: b2ae0444eb1984b86c02e571bb1efeaacdeafcf1)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: 1456cdef9e1a28f7abe1385b10caa5069ba7afac)
Signed-off-by: Malcolm Crossley <malcolm.crossley@ge.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
All 64-bit PPC processors support hard-float so no need to support
soft-float.
(From OE-Core rev: 54c7d1faf5376c8fb9b19f4e192ce959c8442782)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
When figuring out how to set TUNE_CCARGS we should look for 'm64' not
'n64' in TUNE_FEATURES.
(From OE-Core rev: 7a9ea28e69e8121a559f610dd2330edd33f0a907)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This reads the sgml-docbook.bak and adds the entries into sgml-docbook.cat since
this occurs out of order during shared state sysroot populate.
(From OE-Core rev: 87d68520c190007869ed1877fbb40eef23763524)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This patch writes a sgml-docbook.bak that is read by the sgml-common during a shared
state sysroot populate, because it comes out of order.
(From OE-Core rev: b372198fe3c9d8be18bd15545fb0bc4dd9d5aa68)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This patch writes a sgml-docbook.bak that is read by the sgml-common during a shared
state sysroot populate, because it comes out of order.
(From OE-Core rev: 4d4047c7b997a9cee96f170c203315cbd82ff084)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This patch writes a sgml-docbook.bak that is read by the sgml-common during a shared
state sysroot populate, because it comes out of order.
(From OE-Core rev: 457f30a389031947f037bd7ea1217c190c2089c1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
The do_archgen step creates a script that utilizes the variable name
${ARCH}. However, we also utilize and define ${ARCH} so instead of
having the following in the script:
COMPAT_WITH="${ARCH},${COMPAT} $COMPAT_WITH"
We get something like:
COMPAT_WITH="powerpc,${COMPAT} $COMPAT_WITH"
Just renaming the variable in the script to not conflict with ${ARCH}
fixes the issue.
[PR bump from Saul Wold]
(From OE-Core rev: 09573a276456122b408c5bcebc537455fd1c5f29)
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Glibc 2.10.1 is outdated now and eglibc seems to provide a superset of
its functionality.
(From OE-Core rev: 1d9866a2c4fe93202749a56c7ad89a3cbd07d9f8)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Fixed [BUGID #1299]. OLD_MULTIMACH_TARGET_SYS is no longer available.
Use new recipe-scope variable REAL_MULTIMACH_TARGET_SYS instead.
(From OE-Core rev: b69a2be2f30dc633597399d42d6c87d9f0910c1a)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: e23f9ce928353c9da2b9c4bfa9a1a125a7d160f2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Currently tune-xscale.inc has options wrt. setting of xscale/xscale-be tunes.
Fix that.
(From OE-Core rev: 90ce6e4b7ffaaf1e3af39583ca62b20f08e78959)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
PACKAGE_EXTRA_ARCHS_tune-armv5eb needs to be defined in terms of
the non-e with the same endianness, i.e. PACKAGE_EXTRA_ARCHS_tune-armv5b
not PACKAGE_EXTRA_ARCHS_tune-armv5, otherwise PACKAGE_EXTRA_ARCHS will
end up containing a semi-random mixture of endiannesses and disaster
will ensue. Likewise for the vfp and armv6 variants.
This is all a bit confusing because TUNE_FEATURES is done the opposite
way around, i.e. TUNE_FEATURES_tune-armv5eb is derived by taking the
armv5e version and adding bigendian. But fixing that is probably
a subject for a separate patch.
(From OE-Core rev: 391c0102a81455c76244d13b6878e3a76cca65dc)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Otherwise the test in TUNE_CCARGS will never match.
(From OE-Core rev: 3b7784021259ac745c80043bec16189fa8f4e45e)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Because of the way BitBake handles ??= under certain circumstances, this
default setting ends up stepping all over the real setting from the arch
include file. Since virtually all arch include files or tune files define
a real value for this we shouldn't need to have a default (or it needs to
be done in a different way).
(From OE-Core rev: 6c43ca6fc6a7fffc84cf28684cac0c0eb4129902)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: 59c26a280f909470e19a2be04b8ea9dd3aa5c24b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: 78a1a915d660d6039ac532239e25ead8507bc2df)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
ghostscript fails some time on autobuilder, it seems a parallel build issue.
Add patch to fix it.
Fixes [Yocto #1202]
(From OE-Core rev: 90c0eabcce04e8358ce8df9cd9ed60fdeea68cf5)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
tested on beagleboard/angstrom and qemuarm/angstrom
(From OE-Core rev: 19145d0cd27c5c7e732c06dee9fce4cd60cbd0b3)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This makes debugging the new tune code easier since it doesn't involve staring at 'bitbake -e' output anymore.
(From OE-Core rev: c1903b1221e9b419aefe49e40a8acd61575de797)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
| ERROR: QA Issue: non debug package contains .debug directory: libpam-xtests path /work/armv7a-angstrom-linux-gnueabi/libpam-1.1.4-r0/packages-split/libpam-xtests/usr/share/Linux-PAM/xtests/.debug/tst-pam_dispatch4
(From OE-Core rev: 4acbbefd67ac02322bb2ca455e6aaf5b78652dff)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
connman plugins have dependency on bluez4, wpa-supplicant, and ofono.
These names are hardcoded, fix the issue to support multilib.
(From OE-Core rev: a27503dc76652afef6eaf7330c8e6a421d72a6fc)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Support install multiple multilib in opkg backend.
The installation is done in 3 phases.
Phase 1: install normal packages to IMAGE_ROOTFS.
Phase 2: install multilib packages under MULTILIB_TEMP_ROOTFS. Packages
belongs to the same multilib arch would be installed to a unique
directory.
Phase 3: check file confliction between IMAGE_ROOTFS and
MULTILIB_TEMP_ROOTFS, install multilib packages to IMAGE_ROOTFS only if
the sanity check passed.
(From OE-Core rev: 9d81c2166be7ed388e5616e01ca2b4059e524c8e)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
1. Added MULTILIB_PACKAGE_INSTALL for multilib instances of packages to
be installed in the rootfs.
2. MULTILIBRE_ALLOW_REP contains the regular expression to match the
files allow to be replaced by the conflicting files.
3. MULTILIBRE_FORCE_SAME contains the regular expression to match the
files allow to be replaced only if the conflicting files are identical.
4. Added shell function multilib_sanity_check() to check whether the
overwring for multilib situation is allowed.
(From OE-Core rev: 137a4626a7e8107fc8a71724d5124f44236293b9)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This is a first pass at adding multilib support to the RPM package
and image handling code.
(From OE-Core rev: 1939a4395997098862912e013a2b13ed2f385f9f)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: 22a42df1843c8a95cf3be214a413d660adaadb32)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
merged
(From OE-Core rev: 4f6783b83d722d040707d0b7cd69f27b133bd562)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Since we now handle GLIBC_DYNAMIC_LINKER in gcc-configure-common.inc:
's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#'
we can drop the patch which changes a hardcoded value for this.
No PR bump since there is no code change resulting from this, its just
a cleanup.
There is still a valid question over the remainder of this patch and its
interaction with multilib configurations.
(From OE-Core rev: 036faf66c3889cd8bf4cd3c9b97c80f008f3c6e2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: b9a0fd48570a603692c8a177b2b0583429639592)
Signed-off-by: Yu Ke <ke.yu@intel.com>
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>
|
|
in multilib case, the PACKAGE_DYNAMIC is overrided with multilib
prefix. Take multilib:lib64-perl as example. the "perl-module-*"
will become "lib64-perl-module-*"
the output_pattern in do_split_packages is designed to work with
PACKAGE_DYNAMIC, so it should be applied with the same logic, i.e.
overriding with multilib prefix. otherwise the do_split_package will
split incorrect files
this patch implements the mulitlib override logic for do_split_packages
We also need to rename the extra_depends to support multilib case
(from Dongxaio Xu).
(From OE-Core rev: a4bc86713892502aeefbbdb3053e8cf1e1fc0bdb)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
prune_suffix() also needs be aware of MLPREFIX when changing PN for
use in BPN.
(From OE-Core rev: 20dd241052afa5ff80b91ebf09b0b48765bc3412)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This patch adds the core multilib class which can be used along with a
parameter specifying the mutlilib to use in BBCLASSEXTEND.
The MLPREFIX variable is added and can be used in cases where its too
difficult to dynmaically work out where a mutltilib prefix is needed
to be added to a variable.
This includes:
* SHLIBSDIR and PACKAGE_ARCH fixes from Lianhao Lu.
* PACKAGE_DYNAMIC mapping from Yu Ke
* PACKAGE_INSTALL mapping from Yu Ke
* RPROVIDES mapping from Yu Ke
* TARGET_VENDOR fix from Mark Hatle
* Ignorning *-native-runtime dependnecies as well as *-native from Yu Ke
* Map PKG and ALLOW_EMPTY from Dongxiao Xu
* Ensure RCONFLICTS and PKG field dependencies are remapped (from Dongxiao Xu)
* Ensure PN and MLPREFIX are set at the same time to ensure consistent BPN values (Yu Ke)
(From OE-Core rev: 5d9453049915db48ec4b5972e12287417ebb61a2)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Xu Dongxiao <dongxiao.xu@intel.com>
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Updating the linux-yocto SRCREVs to pickup changes from the
continuing uprev to korg 3.0. With this set of update, the
meta/feature audits are complete.
qemumips and qemuppc are fixed with this update and can now
boot to a prompt.
(From OE-Core rev: b4ec5c27b51c15e8bde7ca2597329c4f5b801240)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This means if PKGARCHCOMPAT_ARMV7A is set, "armv7a-vfp-neon" is renamed
to be "armv7a". Other compatibility mappings can be added as needed.
(From OE-Core rev: 08c0b7060009113e8dffdef51ff6b9b4b7f28894)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: e198b72bc03c7545417944dcb3c930aaf2376488)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
We need to include file class and file color in order to do the conflict
resolution required with a multilib design. This is normally disabled when
we don't use the internal dependency generator, patch enables it in
all cases.
(From OE-Core rev: 4c43ea3440ecca02d2945b02017f56a8de9ff808)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
When linking with gcc, the parameter is read from left to write, if *.o
calls a function contained in libxxx, the parameter order should be
"gcc ... *.o -lxxx".
This commit fixes the problem in distcc.
(From OE-Core rev: 782499eaa817f1beecc0aea5bfa075196f8e2a53)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
(From OE-Core rev: 3212029f0967dd353fec8cc147d2b95031d1018a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
Richard Purdie
Mark Hatle
Koen Kooi
Yu Ke
Kumar Gala
Malcolm Crossley
Saul Wold
Phil Blundell
Lianhao Lu
Martin Jansa
Dmitry Eremin-Solenikov
Paul Eggleton
Kang Kai
Dongxiao Xu
Bruce Ashfield