The code was using a mixture of XXX_SYS and RUST_XXX_SYS. Use
RUST_XXX_SYS consistently and add the variables to the global exclsion
on signatures as they're reflected in the directory triplets and trying
to filter them out the hashes separately is too painful.
(From OE-Core rev: ee0c0fdf9c1eba9eece6ed1293fda25bf18964b3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a patch which removes the sections of code which encode buildpaths. Whilst
not ideal, the patches at least show where the problematic data is coming from
and should allow more focused work to resovle it by someone who has a better
understanding of rust and what this code is doing. It does look unlikely we
actually need this code in our usecases anyway.
(From OE-Core rev: c08c522fc29445aef0c64f0dd8df8a3531c04afa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For musl we need to be able to add a library to the end of the linker commandline.
Rework the wrapper code to be able to do this through a new variable.
(From OE-Core rev: dfff5a176765c0e8b212bf31081f80e79025fd1b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These variables don't need to be exported into the environment, which reduces
the scope of rebuilds when variable values change.
(From OE-Core rev: 1a992268e556a79daa6802367f48796000a1f436)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Similarly to CC and CCLD, handle CXX flags too.
(From OE-Core rev: e2fc083529d526cb565a2de1917022d10c7d08b8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add MIPS n32 target information. This appears to be correct but
building libstd-rs for the target doesn't work.
(From OE-Core rev: 255be90dc8e3625060c9b8ccc2ec3a71f24470d2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building rust for musl targets we need the static library from musl,
so enable it.
(From OE-Core rev: 8d0251ec18ec8d7d66a61cca8adcba5ba246cd92)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There looks to be a reproducibility issue left in one of the rust
libraries. It doesn't appear to be a string issue but some binary
problem. Disable rust from the reproducibility testing until we can
get to the bottom of the issue (allowing wider testing of all the
other improvements).
(From OE-Core rev: a261333f6591ea94afc567dee04a2e3c6d5059cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The n32 MIPS rust SDK doesn't quite build (libstd-rs fails with an llvm
register issue). Disable it for now, someone with interest in having it working
can fix if/as/when.
(From OE-Core rev: aad10f24eea5a6b54de17138ab5c0f4ed1355a8f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Similarly to what native.bbclass does, clear TUNE_FEATURES since these
aren't appropriate to the nativesdk build. This saves us having to change
down signature issues due to data in this variable.
(From OE-Core rev: 2e5079e434504a3a22b609f7ddbb7f4c533c4cdb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
glob.glob() depends on the order of files on disk and selecting [0]
is race prone. We should cover all the nativesdk files so rework
the function to do this.
Spotted as some oe-selftests failed, some passed and it raised a question
of why!
(From OE-Core rev: 8818478420a5c73b1dc1710774545f7e984307da)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Enable multilib and wic at the same time and we'll meet the
following error.
ERROR: Nothing PROVIDES 'virtual/i686-wrsmllib32-linux-binutils'
Adjust the dependency to take multilib into consideration.
(From OE-Core rev: 958ee0eede859bdba659e3343856b1c226207854)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
reproducible.patch
refreshed for new version.
0001-change-shebang-to-python3.patch
removed as not needed since upstream has removed the shebang lines.
License-Update:
src/pip/_vendor/html5lib/LICENSE: removed since it's not it new version
src/pip/_vendor/chardet/LICENSE: file format modified, change St to Street
src/pip/_vendor/pygments/LICENSE: Copyright year updated to 2022
(From OE-Core rev: d69f360bb48001a4ec9220c8f935bb5fe43b4f7a)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changelog:
=========
Error out instead of crashing when marshaling unsupported fundamental types in some cases !180
Add a workaround for a PyPy 3.9+ bug when threads are used !200
Fix crashes when marshaling zero terminated arrays for certain item types !191
Fix a crash/refcounting error in case marshaling a hash table fails !191
Make the test suite pass again with PyPy !191
tests: support running tests with (MSVC) CPython 3.8+ on Windows !206
interface: Fix leak when overriding GInterfaceInfo !204
setup.py: look up pycairo headers without importing the module (helps with building on Windows and MSVC CPython 3.8+) !205
(From OE-Core rev: 14c442bfe4886e6180bd58f5e69928efd54e9c3c)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Changelog:
===========
-Fix relative $ref resolution when the base URI is a URN or other scheme (#544).
-pkgutil.resolve_name is now used to retrieve validators provided on the command
line. This function is only available on 3.9+, so 3.7 and 3.8 (which are still
supported) now rely on the pkgutil_resolve_name backport package. Note however
that the CLI itself is due to be deprecated shortly in favor of check-jsonschema.
-best_match no longer traverses into anyOf and oneOf when all of the errors
within them seem equally applicable. This should lead to clearer error messages
in some cases where no branches were matched.
(From OE-Core rev: 203dc71c2b2a712a88f41fc6a5b9894d36d0d3c0)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise spdx can have references for data that is not packed
in the package delivered because this contol data is temporarly
and only exist while the package is been write.
During do_package_write_ipk task in do_package_ipk the control
files is cleaned up at the end. This can create a race condiction
when the do_create_spdx task runs the add_package_files function
and these files is been deleted at same time in the
task do_package_write_ipk.
ERROR: alsa-topology-conf-1.2.5.1-r0 do_create_spdx: Error executing a python function in exec_func_python() autogenerated:
The stack trace of python calls that resulted in this exception/failure was:
File: 'exec_func_python() autogenerated', lineno: 2, function: <module>
0001:
*** 0002:do_create_spdx(d)
0003:
File: '/srv/oe/build/conf/../../layers/openembedded-core/meta/classes/create-spdx.bbclass', lineno: 567, function: do_create_spdx
0563: package_doc.add_relationship(package_doc, "DESCRIBES", spdx_package)
0564:
0565: package_archive = deploy_dir_spdx / "packages" / (package_doc.name + ".tar.zst")
0566: with optional_tarfile(package_archive, archive_packaged) as archive:
*** 0567: package_files = add_package_files(
0568: d,
0569: package_doc,
0570: spdx_package,
0571: pkgdest / package,
File: '/srv/oe/build/conf/../../layers/openembedded-core/meta/classes/create-spdx.bbclass', lineno: 234, function: add_package_files
0230: info.mtime = source_date_epoch
0231:
0232: archive.addfile(info, f)
0233:
*** 0234: sha1 = bb.utils.sha1_file(filepath)
0235: sha1s.append(sha1)
0236: spdx_file.checksums.append(oe.spdx.SPDXChecksum(
0237: algorithm="SHA1",
0238: checksumValue=sha1,
File: '/srv/oe/bitbake/lib/bb/utils.py', lineno: 559, function: sha1_file
0555: """
0556: Return the hex string representation of the SHA1 checksum of the filename
0557: """
0558: import hashlib
*** 0559: return _hasher(hashlib.sha1(), filename)
0560:
0561:def sha384_file(filename):
0562: """
0563: Return the hex string representation of the SHA384 checksum of the filename
File: '/srv/oe/bitbake/lib/bb/utils.py', lineno: 528, function: _hasher
0524:
0525:def _hasher(method, filename):
0526: import mmap
0527:
*** 0528: with open(filename, "rb") as f:
0529: try:
0530: with mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) as mm:
0531: for chunk in iter(lambda: mm.read(8192), b''):
0532: method.update(chunk)
Exception: FileNotFoundError: [Errno 2] No such file or directory: '/srv/oe/build/tmp-lmp/work/all-lmp-linux/alsa-topology-conf/1.2.5.1-r0/packages-split/alsa-topology-conf/CONTROL/control'
ERROR: Logfile of failure stored in: /srv/oe/build/tmp-lmp/work/all-lmp-linux/alsa-topology-conf/1.2.5.1-r0/temp/log.do_create_spdx.998864
INFO: recipe alsa-topology-conf-1.2.5.1-r0: task do_create_spdx: Failed
(From OE-Core rev: 0bfe403f46fd568910a727982c3ff528e3d5c8bc)
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a comment so that users grepping for "github" or "gitlab" will find
this code (since the regex wont).
(From OE-Core rev: 07c9c6144748d1fbbbdf9c2cb156bea5bed273d4)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop crosscompile.patch which was merged as part of:
509695c1c (tag: v9.0.0065) patch 9.0.0065: \
cross-compiling doesn't work because of timer_create check
Also drop: racefix.patch which may have been fixed upstream
and is being tracked by:
https://github.com/vim/vim/pull/10776
where upstream is asking if the different approach resolves the
race condition. Let's see what's out there!
(From OE-Core rev: 6996472cd33d2d4b91821f2dfe24a27a697e4afe)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If an invalid key is used, the class ignores the error, with an
indeterminate result. In my case, the problem surfaced in do_deploy:
```
| cp: cannot stat '/.../build/tmp/work/imx6qdlsabresd-fsl-linux-gnueabi/u-boot-imx-mfgtool/2022.04-r0/deploy-u-boot-imx-mfgtool/u-boot.imx': No such file or
| directory
```
The root cause of this was that the uboot config key did not match
a valid option. With the fix, the error is caught by the class:
```
ERROR: Nothing PROVIDES 'u-boot-imx-mfgtool'
u-boot-imx-mfgtool was skipped: The selected UBOOT_CONFIG key ['mfgtool'] has no match in dict_keys(['sd-fslc', 'sd-imx', 'sd-optee-imx', 'sata-imx', 'mfgtool-imx']).
```
(From OE-Core rev: 801a27d73b10017cac3c0caa05d0a2af3502a7ba)
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* backport one more commit for LD call which conflicts with the
0001-kvm-use-LD-instead-of-hardcoding-ld.patch we already had
and replace this 2nd patch with the rebased version which is
now merged upstream
* then backport additional patch which introduces KVM_LD variable
which we can set to use .bfd suffix in LD when ld-is-gold is
in DISTRO_FEATURES to work around gold incompatibility reported:
https://github.com/linux-test-project/ltp/pull/948#issuecomment-1193138866https://lists.openembedded.org/g/openembedded-core/message/168193http://errors.yoctoproject.org/Errors/Details/663094/
x86_64-oe-linux-ld --sysroot=/OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/ltp/20220527-r0/recipe-sysroot -z noexecstack -r -T /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/ltp/20220527-r0/git/testcases/kernel/kvm/linker/payload.lds --oformat=elf64-x86-64 -o kvm_pagefault01-payload.o kvm_pagefault01-payload.bin
x86_64-oe-linux-ld: error: kvm_pagefault01-payload.bin:1:1: invalid character
make: *** [Makefile:53: kvm_pagefault01-payload.o] Error 1
(From OE-Core rev: ace41f64c7d617852bdfca736cefa0a470598af7)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As discussied in [YOCTO #14717] cmake contains a OEToolchainConfig.cmake
file to configure the toolchain correctly in cross-compile build for recipes
using cmake. The CMAKE_ASM_FLAGS are the configuration are meant for assembly,
but the spelling is incorrect and the Flag is ASFLAGS for gcc and other compilers.
So this variable might neever have worked and it is better for
recipes to specify their own.
(From OE-Core rev: 72729ffbab53f95ee9dd1bc22913d9b864495930)
Signed-off-by: Martin Beeger <martin.beeger@online.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Wic can build an unified kernel image, but this needs the cross-objcopy
from binutils.
(From OE-Core rev: 7c7a488116f49083ca42d3628ebc0870585110c3)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We need to use shutil.rmtree here since removedirs() only covers
directories. Make the exception for specific too to make errors
easier to catch.
(From OE-Core rev: 9d2a661e46123a2292f7887658e6fa54923dbcc0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport various post 20220527 release runtime fixes:
* The concept of max runtime
* tst_test.sh: Cleanup getopts usage
* mountns0[1-3]: wait for umount completed in thread_b
(From OE-Core rev: 1946833bdcce57250f346db1b8f2f898c2c3244c)
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The correct field name is "supplier" according to SPDX schema.
The "supplier" field translates to "PackageSupplier", but that's for
tag-value format.
(From OE-Core rev: ca8db0e0a2860ac1e3f537471fa71b43c3be0a58)
Signed-off-by: Mihai Lindner <mihai.lindner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There's been a recent discussion about how we can make the Yocto SDK
experience better [1]. One of the ideas was to eliminate the SDK
as a separate artefact altogether and simply provide everything
that the SDK and eSDKs do directly in a yocto build. This does not
mean that people have to 'learn Yocto', but rather that the integrators
should provide a well-functioning sstate cache infrastructure (same as
with minimal eSDK, really), and a few wrapper scripts for setting up the build
and the SDK environment that run layer setup and bitbake behind the scenes.
[1] https://lists.openembedded.org/g/openembedded-architecture/topic/thoughts_on_the_esdk/90990557
So without further ado, here's how you get a 'SDK' without building one:
1. Set up all the needed layers and a yocto build directory.
2. Run:
$ bitbake meta-ide-support
$ bitbake -c populate_sysroot gtk+3
(or any other target or native item that the application developer would need)
$ bitbake populate-sysroots
3. Set up the SDK environment:
. tmp/deploy/images/qemux86-64/environment-setup-core2-64-poky-linux
(adjust accordingly)
Et voila! The Unix environment is now set up to use the cross-toolchain from
Yocto, exactly as in the SDK. And devtool/bitbake are available to extend it,
exactly as in the eSDK.
Theare are numerous benefits here: no need to produce, test, distribute and maintain
separate SDK artifacts. No two separate environments for the yocto build and the SDK.
Less code paths where things can go wrong. Less awkward, gigantic tarballs. Less
SDK update headaches: 'updating the SDK' simply means updating the yocto layers with
git fetch or layer management tooling. Built-in SDK extensibility: just run bitbake
again to add more things to the sysroot, or add layers if even more things are required.
How is this tested?
Exactly same as the regular SDK:
$ bitbake -c testsdk meta-ide-support
This runs the same toolchain tests from meta/lib/oeqa/sdk/cases as the regular
sdk testing does.
(From OE-Core rev: 5c845d7f4ea6ae7ba18ed43180dad28775cace31)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using meson-native directly from bitbake this has no effect and
everything works as before; the use case is being able to build
meson-driven projects from the 'direct SDK' environment. Build systems
like cmake/autotools are entirely driven by environment variables,
but meson needs configuration files, and so this replicates how SDKs
set things up.
In particular, with this change the libepoxy build test from the SDK
test suite is able to pass.
(From OE-Core rev: 87d4f6d176f27c22dbb99abc271b9a6eaca314f8)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a simpler version of the same class in testsdk.py, as it does not
need to unpack and set up the SDK, and can proceed to the tests straight away.
(From OE-Core rev: be21c62e5bd96164aab9e01168b7a43c6de44c17)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Specifically:
1. Add a few more toolchain items to DEPENDS so they're available in the recipe sysroot.
2. Use deploy mechanism to place the SDK environment setup file and testdata for testing it
into the image deploy directory.
3. Add ability to run SDK tests via the testsdk class and task. This also requires providing
a testdata json file.
4. Ensure sysroot population always runs, as those items are mean to be picked up
by 'bitbake build-sysroots' into the unified sysroot.
(From OE-Core rev: 93f419451cc18b5d31b6fe134ca52a2750fa567d)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Specifically:
1. Place the environment setup file into $B and not into $TMPDIR,
so that the recipe using the class can itself better decide what to do with the file.
2. Use global, unified sysroots (provided through build-sysroots recipe)
and not recipe-specific ones, as this allows flexible on-the-fly management of what
libraries are available to build applications, without having to modify any
recipes, similar to eSDK 'extensible' part.
This also requires adjustment of the sstate sametune_samegsigs test, as meta-ide-support
becomes dependent on $MACHINE (unified sysroots have it in their paths)
and needs to be excluded from the test.
3. Add a few missing settings that have been added to SDK environment files.
4. Add a snippet to the environment setup file that also runs the relocation scripts.
In regular SDKs this is executed by the SDK installer, in direct SDK we can do it when
setting up the environment.
(From OE-Core rev: db5dfd78ae441201778b1175f4fb9a3eba994899)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Correct the override name used for rust toolchain removal from the mingw sdk.
(From OE-Core rev: 8aeb0dfe6508daea51db4f0992eed194e925fdd7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It fails to compile mesa{,-native} when DEBUG_BUILD is enabled:
../mesa-22.1.3/src/compiler/nir/nir_inline_helpers.h: In function ‘nir_opt_move_block’:
../mesa-22.1.3/src/compiler/nir/nir_opt_move.c:55:1: error: inlining failed in call to
always_inline ‘src_is_ssa’: indirect function call with a yet undetermined callee
src_is_ssa(nir_src *src, void *state)
^~~~~~~~~~
Backport patch from mesa merge request to fix it.
(From OE-Core rev: 468715c42632a8467dc1f0abe0f3cd540de5f7c3)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
