from:"Alex Kiernan"

Re: [OE-core] [PATCH 1/9] rust: Oe-selftest fixes for rust v1.76.

2024-07-01 Thread Alex Kiernan

On Mon, Jul 1, 2024 at 10:27 AM Yash Shinde via lists.openembedded.org
 wrote:
>
> From: Yash Shinde 
>
> Add the failing tests in rust v1.76 to the exclude list
> and add "ignore" tags to ignore failing unit test cases.
>
> Signed-off-by: Yash Shinde 
> ---

Well done getting all of this in place (and fingers crossed it makes
it through the autobuilders) - this stuff is incredibly painful to
move forwards!



--
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#201296): 
https://lists.openembedded.org/g/openembedded-core/message/201296
Mute This Topic: https://lists.openembedded.org/mt/106974828/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] Debugging rust oe-selftest failures

2024-04-05 Thread Alex Kiernan

On Thu, Apr 4, 2024 at 10:07 AM Yash Shinde via lists.openembedded.org
 wrote:
>
> On Wed, Apr 3, 2024 at 05:51 PM, Alex Kiernan wrote:
>
> Hi Sundeep (or anyone else with insight on this!)
>
> How do you go about debugging rust oe-selftest failures? I've bumped
> everything up to 1.77 (https://github.com/akiernan/poky) but
> oe-selftest fails for reasons that aren't immediately obvious to me...
>
> https://gist.github.com/akiernan/6cc6131c1ec3af866098a9318679cf1b
>
> Any clues?
>
> --
> Alex Kiernan
>
>
>
>
> Hi Alex,
>
> I faced the same errors when I was working on to upgrade rust from 1.75 to 
> 1.76. I discussed it with rust upstream here, 
> https://github.com/rust-lang/rust/issues/122075 and the following change 
> solves those failures,
>
> https://github.com/rust-lang/rust/issues/122075#issuecomment-1985153524
>
> PR- 
> https://github.com/rust-lang/rust/pull/122205/commits/5aece7fad06baaa745784d118db862b3e3ccf7f8
>
>
>
>
>
> After this change was backported to poky, the rust build was successful but 
> it was seen that not all the tests are executed.
>
> While discussing upstream, it was known that removing the --doc option from 
> python3 src/bootstrap/bootstrap.py test --exclude list> --doc --no-fail-fast --bless --target x86_64-poky-linux-gnu  cmd in 
> oeqa/selftest/cases/rust.py file execute the other tests also.
>
>
>
>
>
> But, while doing so another set of failures are observed as mentioned in 
> https://github.com/rust-lang/rust/issues/122285
>
> Complete log using --doc option-  
> https://gist.github.com/Yashinde145/7db6bd4a064021bf756b0c0dd6c8777c
>
> Complete log without using --doc option-  
> https://gist.github.com/Yashinde145/036a934f0523307859f7c855b83ecfd6 (this 
> file is truncated in gist due to large size, please see Complete raw file)
>
> I am not very familiar to these failures but  trying to understand them.
>

Feels like you're way ahead of me. I'll have a bit more of a poke at
it when I've some time, but it feels like we may be mostly waiting on
upstream (and a big +1 for getting them engaged!)

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#197983): 
https://lists.openembedded.org/g/openembedded-core/message/197983
Mute This Topic: https://lists.openembedded.org/mt/105307188/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] Debugging rust oe-selftest failures

2024-04-03 Thread Alex Kiernan

Hi Sundeep (or anyone else with insight on this!)

How do you go about debugging rust oe-selftest failures? I've bumped
everything up to 1.77 (https://github.com/akiernan/poky) but
oe-selftest fails for reasons that aren't immediately obvious to me...

https://gist.github.com/akiernan/6cc6131c1ec3af866098a9318679cf1b

Any clues?

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#197915): 
https://lists.openembedded.org/g/openembedded-core/message/197915
Mute This Topic: https://lists.openembedded.org/mt/105307188/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 35/47] python3-jsonschema: upgrade 4.17.3 -> 4.21.1 and add new dependencies

2024-03-13 Thread Alex Kiernan

On Wed, Mar 13, 2024 at 2:45 PM Theodore A. Roth  wrote:
>
> On Wed, Mar 13, 2024 at 12:53 AM Alexander Kanavin  
> wrote:
>>
>> On Tue, 12 Mar 2024 at 19:55, Theodore A. Roth  wrote:
>>
>> > Any help or things to try would be appreciated. More than happy to provide 
>> > more information if needed.
>>
>> Maturin support is fairly new, and rpds is the first real consumer in
>> oe-core, so issues like this can happen. You need to find out how it
>> forms the installation file name, and then find out how python forms
>> the filename it expects, and see where the mismatch is coming from.
>> Yes it's not simple and requires advanced, intuitive ability to read
>> large, unfamiliar code trees, something that everyone working with
>> yocto should possess. We already map architectures in various rust
>> pieces, e.g. rust-target-config class, so probably something like that
>> should be done in maturin builds too.
>>
>> Alex
>
>
> Making the following change (via a patch in a .bbappend) to the rpds 
> Cargo.toml file fixed the import problem for me.
>
> Do not know if this problem is specific to our environment or not at this 
> point.
>
> Ted Roth
>
> diff --git a/Cargo.toml b/Cargo.toml
> index 78ac37f..c1f2ccd 100644
> --- a/Cargo.toml
> +++ b/Cargo.toml
> @@ -13,4 +13,4 @@ archery = "1.1.0"
>
>  [dependencies.pyo3]
>  version = "0.20.2"
> -features = ["extension-module"]
> +features = ["extension-module", "abi3-py37"]
>

It's not clear from the cargo docs, but I _think_ you might be able to
achieve this using:

CARGO_BUILD_FLAGS += "--features pyo3/abi3-py37"

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#197074): 
https://lists.openembedded.org/g/openembedded-core/message/197074
Mute This Topic: https://lists.openembedded.org/mt/104767980/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core][PATCH] sstate-cache-management: fix regex for 'sigdata' stamp files

2024-02-16 Thread Alex Kiernan

On Fri, Feb 16, 2024 at 10:46 AM André Draszik  wrote:
>
> Given file names like
> 
> 6.4.do_fetch.sigdata.821b6c62f9f2bd8b7e1378656b8319697a21f6f6e4a351f98dc325a18ef7ed0f,
> I'm pretty sure we want to match the dot here, not any character.
>
> Fixes: 2fa1b25d7485 ("sstate-cache-management: Rewrite in python") in oe-core
> Fixes: b723fcaac52f ("sstate-cache-management: Rewrite in python") in poky
> Signed-off-by: André Draszik 
> ---

Ouch... good catch!

>  scripts/sstate-cache-management.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/sstate-cache-management.py 
> b/scripts/sstate-cache-management.py
> index 09b7aa2aefd8..d3f600bd28f6 100755
> --- a/scripts/sstate-cache-management.py
> +++ b/scripts/sstate-cache-management.py
> @@ -147,7 +147,7 @@ def remove_by_stamps(args, paths):
>  for stamps_dir in args.stamps_dir:
>  stamps_path = Path(stamps_dir)
>  assert stamps_path.is_dir()
> -re_sigdata = re.compile(r"do_.*.sigdata\.([^.]*)")
> +re_sigdata = re.compile(r"do_.*\.sigdata\.([^.]*)")
>  all_sums |= set(
>      [
>      re_sigdata.search(x.parts[-1]).group(1)
> --
> 2.44.0.rc0.258.g7320e95886-goog
>
>
> 
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#195770): 
https://lists.openembedded.org/g/openembedded-core/message/195770
Mute This Topic: https://lists.openembedded.org/mt/104390352/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 4/4] rust: Upgrade 1.74.1 -> 1.75.0

2024-01-14 Thread Alex Kiernan

On Thu, Jan 11, 2024 at 2:54 PM Sundeep KOKKONDA via lists.openembedded.org
 wrote:
>
> On Tue, Jan 2, 2024 at 02:54 PM, Alex Kiernan wrote:
>
> Closing this off - for whatever reason the buildpaths check wasn't
> getting run when I was testing stuff, so what I thought was a fix,
> wasn't.
>
> Hello Alex,
>
> Are you working on fixing this issue?
>

I'm not at the moment and I don't think I've anything useful as a direction
at this point.

>
> Thanks,
> Sundeep K.
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193612): 
https://lists.openembedded.org/g/openembedded-core/message/193612
Mute This Topic: https://lists.openembedded.org/mt/103433093/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][RFC PATCH] sstate-cache-management: Rewrite in python

2024-01-08 Thread Alex Kiernan

otfs_wicenv shared_workdir 
> sizecheck stash_locale strip symlink_kernsrc transform_kernel unpack 
> validate_branches warn_musl write_config write_qemuboot_conf
> Figuring out the archs in the sstate cache dir ...
> Done
> The following archs have been found in the cache dir:
> allarch qemux86_64 x86_64
> ...
> 14339 out of 73198 files will be removed!
> ...
> 14339 files have been removed!
> 77G sstate-cache/
> nanbield $ du -hs sstate-cache/; 
> ../scarthgap/openembedded-core/scripts/sstate-cache-management.py -d 
> --cache-dir=sstate-cache; du -hs sstate-cache/
> 77G sstate-cache/
> 43490 out of 60639 files will be removed!
> Do you want to continue (y/n)?
> y
> 11G sstate-cache/
>
> On Sat, Dec 23, 2023 at 3:25 PM Alex Kiernan  wrote:
>>
>> This (should be) a drop in replacement for sstate-cache-management.sh.
>> Signed-off-by: Alex Kiernan 
>> ---
>> This is hopefully an option compatible drop in for the existing shell
>> sstate-cache-management script. It's orders of magnitude faster, for
>> example removing duplicates, with a warmed cache across a more or less
>> vanilla poky build:
>>
>> shell: 24.55s
>> python: 0.63s
>>
>> Running on an NFS mount with 1000s of objects the improvement is even
>> more marked.
>>
>> There are differences in the lists of things which are removed, but all
>> examples I've found are things where the shell failed to remove things
>> it could.
>>
>> There's an additional option to remove orphan siginfo files, which I
>> found quite a lot of during testing.
>>
>> The --extra-archs and --extra-layer options are unimplemented since, as
>> far as I could work out, they were really implementation artefacts of
>> the existing script - there's a couple of functions I implemented which
>> generate this data, but I really couldn't see anywhere I actually needed
>> it; these want deleting if this goes beyond RFC.
>>
>> Similary the --follow-symlink option is unimplemented as that appears to
>> an sstate-cache implementation detail which is no longer used.
>>
>> The couple of TODOs left are all about more parallelisation, I expect
>> neither of them is as big a win as parallelising the stat()ing of all
>> the paths was (especially when running over NFS).
>>
>>  scripts/sstate-cache-management.py | 329 +
>>  1 file changed, 329 insertions(+)
>>  create mode 100755 scripts/sstate-cache-management.py
>>
>> diff --git a/scripts/sstate-cache-management.py 
>> b/scripts/sstate-cache-management.py
>> new file mode 100755
>> index ..3ae3a7fa0515
>> --- /dev/null
>> +++ b/scripts/sstate-cache-management.py
>> @@ -0,0 +1,329 @@
>> +#!/usr/bin/env python3
>> +#
>> +# Copyright OpenEmbedded Contributors
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +import argparse
>> +import os
>> +import re
>> +import sys
>> +
>> +from collections import defaultdict
>> +from concurrent.futures import ThreadPoolExecutor
>> +from dataclasses import dataclass
>> +from pathlib import Path
>> +
>> +if sys.version_info < (3, 8, 0):
>> +raise RuntimeError("Sorry, python 3.8.0 or later is required for this 
>> script.")
>> +
>> +SSTATE_PREFIX = "sstate:"
>> +SSTATE_EXTENSION = ".tar.zst"
>> +# SSTATE_EXTENSION = ".tgz"
>> +# .siginfo.done files are mentioned in the original script?
>> +SSTATE_SUFFIXES = (
>> +SSTATE_EXTENSION,
>> +f"{SSTATE_EXTENSION}.siginfo",
>> +f"{SSTATE_EXTENSION}.done",
>> +)
>> +
>> +RE_SSTATE_PKGSPEC = re.compile(
>> +rf"""sstate:(?P[^:]*):
>> + (?P[^:]*):
>> + (?P[^:]*):
>> + (?P[^:]*):
>> + (?P[^:]*):
>> + (?P[^_]*):
>> + (?P[^_]*)_
>> + (?P[^:]*)
>> + (?P({"|".join([re.escape(s) for s in SSTATE_SUFFIXES])}))$""",
>> +re.X,
>> +)
>> +
>> +
>> +# Really we'd like something like a Path subclass which implements a stat
>> +# cache here, unfortunately there's no good way to do that transparently
>> +# (yet); see:
>> +#
>> +# https://github.com/python/cpython/issues/70219
>> +# https://discuss.python.org/t/make-pathlib-extensible/3428/77
>> +@dataclass
>> +class SstateEntry:
>> +"""Class for keeping track of an entry in sstate-cache."""
>> +
>

Re: [OE-Core][PATCH 4/4] rust: Upgrade 1.74.1 -> 1.75.0

2024-01-02 Thread Alex Kiernan

On Sun, Dec 31, 2023 at 2:34 PM Alex Kiernan via
lists.openembedded.org 
wrote:
>
> On Sun, Dec 31, 2023 at 2:23 PM Richard Purdie
>  wrote:
> >
> > On Sat, 2023-12-30 at 15:49 +, Alex Kiernan wrote:
> > > Drop backported musl fixes. Set `change-id` rather than `changelog-seen`
> > > to fix build warning. Add fixes for 85c0ce24cc74 ("remap cargo
> > > dependencies to /rust/deps") which otherwise cause build failures:
> > >
> > > > thread 'main' panicked at src/core/builder.rs:1795:26:
> > > > std::fs::read_dir(registry_src) failed with No such file or directory 
> > > > (os error 2)
> > >
> > > https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html
> > > Signed-off-by: Alex Kiernan 
> >
> > Unfortunately there were rust reproducibility failures too:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4170/steps/12/logs/stdio
> >
>
> Thanks, that's useful.
>
> Not sure why I didn't see that locally as on the face of it, it's
> (mostly?) the build path embedded in one of the output files

Closing this off - for whatever reason the buildpaths check wasn't
getting run when I was testing stuff, so what I thought was a fix,
wasn't.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193224): 
https://lists.openembedded.org/g/openembedded-core/message/193224
Mute This Topic: https://lists.openembedded.org/mt/103433093/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 4/4] rust: Upgrade 1.74.1 -> 1.75.0

2023-12-31 Thread Alex Kiernan

On Sun, Dec 31, 2023 at 2:23 PM Richard Purdie
 wrote:
>
> On Sat, 2023-12-30 at 15:49 +, Alex Kiernan wrote:
> > Drop backported musl fixes. Set `change-id` rather than `changelog-seen`
> > to fix build warning. Add fixes for 85c0ce24cc74 ("remap cargo
> > dependencies to /rust/deps") which otherwise cause build failures:
> >
> > > thread 'main' panicked at src/core/builder.rs:1795:26:
> > > std::fs::read_dir(registry_src) failed with No such file or directory (os 
> > > error 2)
> >
> > https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html
> > Signed-off-by: Alex Kiernan 
>
> Unfortunately there were rust reproducibility failures too:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4170/steps/12/logs/stdio
>

Thanks, that's useful.

Not sure why I didn't see that locally as on the face of it, it's
(mostly?) the build path embedded in one of the output files, but
there's a lot more in there that feels concerning too :(

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193093): 
https://lists.openembedded.org/g/openembedded-core/message/193093
Mute This Topic: https://lists.openembedded.org/mt/103433093/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 2/4] cargo: Create CARGO_HOME and CARGO_VENDORING_DIRECTORY

2023-12-30 Thread Alex Kiernan

Remove assumption that CARGO_VENDORING_DIRECTORY is ${CARGO_HOME}/bitbake
and create both directories as part of cargo configure.

Signed-off-by: Alex Kiernan 
---

 meta/classes-recipe/cargo_common.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index 0fb443edbdde..e932ada862bd 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -45,7 +45,7 @@ CARGO_LOCK_PATH ??= "${@ 
os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_P
 
 CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}"
 cargo_common_do_configure () {
-   mkdir -p ${CARGO_HOME}/bitbake
+   mkdir -p "${CARGO_VENDORING_DIRECTORY}" "${CARGO_HOME}"
 
cat <<- EOF > ${CARGO_HOME}/config
# EXTRA_OECARGO_PATHS
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193075): 
https://lists.openembedded.org/g/openembedded-core/message/193075
Mute This Topic: https://lists.openembedded.org/mt/103433090/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 3/4] cargo: Move vendor directory to registry/src

2023-12-30 Thread Alex Kiernan

rust 1.75 has an assumption from 85c0ce24cc74 ("remap cargo dependencies
to /rust/deps") that unpacked crates (vendored or otherwise)
are found in .../registry/src (usually in ~/.cargo). Moving our vendor
directory to match is the easiest workaround to avoid the upstream
assumption causing issues.
Signed-off-by: Alex Kiernan 
---
This requires the concomitant change in bitbake to use
CARGO_VENDORING_DIRECTORY for unpacking crates into.

 meta/classes-recipe/cargo_common.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index e932ada862bd..3cb21cfddcb6 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -31,7 +31,7 @@ export PKG_CONFIG_ALLOW_CROSS = "1"
 CARGO_DISABLE_BITBAKE_VENDORING ??= "0"
 
 # Used by libstd-rs to point to the vendor dir included in rustc src
-CARGO_VENDORING_DIRECTORY ??= "${CARGO_HOME}/bitbake"
+CARGO_VENDORING_DIRECTORY ??= "${CARGO_HOME}/registry/src"
 
 # The directory of the Cargo.toml relative to the root directory, per default
 # assume there's a Cargo.toml directly in the root directory
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193076): 
https://lists.openembedded.org/g/openembedded-core/message/193076
Mute This Topic: https://lists.openembedded.org/mt/103433091/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 1/4] rust: Move RUST_DIST_SERVER to rust-config.inc

2023-12-30 Thread Alex Kiernan

Overriding the location of RUST_DIST_SERVER is useful for testing rust
pre-releases, but we need it in rust-source and rust-snapshot; move
RUST_DIST_SERVER to rust-config.inc so we can set it to
`dev-static.rust-lang.org` and use it from both locations.

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/rust-config.inc   |  1 +
 meta/recipes-devtools/rust/rust-snapshot.inc |  2 --
 meta/recipes-devtools/rust/rust-source.inc   |  4 +++-
 meta/recipes-devtools/rust/rust_1.74.1.bb| 11 ---
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-devtools/rust/rust-config.inc

diff --git a/meta/recipes-devtools/rust/rust-config.inc 
b/meta/recipes-devtools/rust/rust-config.inc
new file mode 100644
index ..9fd360616bc4
--- /dev/null
+++ b/meta/recipes-devtools/rust/rust-config.inc
@@ -0,0 +1 @@
+RUST_DIST_SERVER ??= "https://static.rust-lang.org;
diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc 
b/meta/recipes-devtools/rust/rust-snapshot.inc
index ffc1aed2957c..b67e42d27063 100644
--- a/meta/recipes-devtools/rust/rust-snapshot.inc
+++ b/meta/recipes-devtools/rust/rust-snapshot.inc
@@ -52,8 +52,6 @@ SRC_URI += " \
 
${RUST_DIST_SERVER}/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components
 \
 "
 
-RUST_DIST_SERVER = "https://static.rust-lang.org;
-
 RUST_STD_SNAPSHOT = 
"rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 RUSTC_SNAPSHOT = 
"rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 CARGO_SNAPSHOT = 
"cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 83a0dbc15fae..fdac009c6d20 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -1,6 +1,8 @@
+require rust-config.inc
+
 RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}"
 
-SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \
+SRC_URI += 
"${RUST_DIST_SERVER}/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \
 file://hardcodepaths.patch;patchdir=${RUSTSRC} \
 
file://0001-Don-t-use-LFS64-symbols-on-musl.patch;patchdir=${RUSTSRC} \
 file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
diff --git a/meta/recipes-devtools/rust/rust_1.74.1.bb 
b/meta/recipes-devtools/rust/rust_1.74.1.bb
index 30543ada7dbc..dd931a42717c 100644
--- a/meta/recipes-devtools/rust/rust_1.74.1.bb
+++ b/meta/recipes-devtools/rust/rust_1.74.1.bb
@@ -316,6 +316,10 @@ python do_update_snapshot() {
 arch = m.group('arch')
 
src_uri[arch].append(f"SRC_URI[{component}-snapshot-{arch}.sha256sum] = 
\"{v}\"")
 
+config = """\
+RUST_DIST_SERVER ??= "%s"
+""" % config_dist_server
+
 snapshot = """\
 ## This is information on the rust-snapshot (binary) used to build our current 
release.
 ## snapshot info is taken from rust/src/stage0.json
@@ -337,12 +341,13 @@ SRC_URI += " \\
 
${RUST_DIST_SERVER}/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components
 \\
 "
 
-RUST_DIST_SERVER = "%s"
-
 RUST_STD_SNAPSHOT = 
"rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 RUSTC_SNAPSHOT = 
"rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 CARGO_SNAPSHOT = 
"cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
-""" % config_dist_server
+"""
+
+with open(os.path.join(d.getVar("THISDIR"), "rust-config.inc"), "w") as f:
+f.write(config)
 
 with open(os.path.join(d.getVar("THISDIR"), "rust-snapshot.inc"), "w") as 
f:
 f.write(snapshot)
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193074): 
https://lists.openembedded.org/g/openembedded-core/message/193074
Mute This Topic: https://lists.openembedded.org/mt/103433088/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH v4 00/10] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-30 Thread Alex Kiernan

On Sat, Dec 30, 2023 at 11:08 AM Richard Purdie
 wrote:
>
> On Fri, 2023-12-29 at 11:44 +, Alex Kiernan wrote:
> > This is the 1.74.1 rust series rebased to include a revert of
> > https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
> > which I'm pretty sure is what's causing our filename churn. I've checked
> > 1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
> > which had the issue) and in both cases we're not generating the dirname
> > based prefix - hopefully that means that the interim commits are fine
> > too, if not we can do the step back through the commits to find the next
> > issue.
> >
> > Changes in v4:
> > - Mark hello-rs as EXCLUDE_FROM_WORLD as it's not reproducible
> >
> > Changes in v3:
> > - Add hello-rs as a replacement for the tests which used zvariant
> >
> > Changes in v2:
> > - Skip zvariant based test rather than deleting it.
> >
> > Alex Kiernan (10):
> >   devtool: selftest: Fix test_devtool_modify_git_crates_subpath
> > inequality
> >   devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend
> > check
> >   meta-selftest: hello-rs: Simple rust test recipe
> >   devtool: selftest: Swap to hello-rs for crates testing
> >   zvariant: Drop recipe
> >   rust: Upgrade 1.71.1 -> 1.72.0
> >   rust: Upgrade 1.72.0 -> 1.72.1
> >   rust: Upgrade 1.72.1 -> 1.73.0
> >   rust: Upgrade 1.73.0 -> 1.74.0
> >   rust: Upgrade 1.74.0 -> 1.74.1
>
> Thanks for working through this, I've gone ahead and merged it :)
>
> I am a little worried that:
>
> * the test recipe isn't reproducible

This one concerns me... upstream is clearly trying to get
reproducibility yet we're seeing issues. I worry that we're doing
something which means they're not seeing it.

> * we still have the tests disabled

I think we need to find a way to engage with upstream on this - as far
as I can tell they simply don't run the tests on release code, only on
nightlies, so we're really going off-piste here.

> * the next version looks problematic

Hopefully I've found/fixed the issues - it looks like it's bugs from
poor assumptions which don't hold true in our world and at least one
FIXME in the upstream code :| Just tidying the patches and will send
it shortly.

>
> but I think we're at the point it makes sense to move to the newer
> version.
>

Thanks!



--
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193072): 
https://lists.openembedded.org/g/openembedded-core/message/193072
Mute This Topic: https://lists.openembedded.org/mt/103415633/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH v4 03/10] meta-selftest: hello-rs: Simple rust test recipe

2023-12-30 Thread Alex Kiernan

On Sat, Dec 30, 2023 at 12:41 AM Richard Purdie
 wrote:
>
> On Fri, 2023-12-29 at 14:04 +0200, Alexander Kanavin wrote:
> > Reproducibility exclusions should be listed in the test itself, so
> > this continues to be built in regular world builds (otherwise it may
> > silently regress).
>
> FWIW this is what the zvariant recipe was doing and the recipe is in
> meta-selftest...
>
> I'm torn on it to be honest.
>

I'm fine with changing it (and I did basically copy from zvariant
without really thinking about it), but I do feel that leaking what's a
pretty poor recipe name (`hello-rs`) outside of meta-selftest into the
wider ecosystem wouldn't be ideal as the recipe itself is basically
useless other than for this specific test purpose.

Mostly I just want to get the series merged before anything else
changes and we find yet another thing which needs fixing; also I think
I've got 1.75.0 building now, which obviously sits on top of this
series!

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193067): 
https://lists.openembedded.org/g/openembedded-core/message/193067
Mute This Topic: https://lists.openembedded.org/mt/103415636/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v4 10/10] rust: Upgrade 1.74.0 -> 1.74.1

2023-12-29 Thread Alex Kiernan

https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} | 0
 .../rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb}   | 0
 ...t-cross-canadian_1.74.0.bb => rust-cross-canadian_1.74.1.bb} | 0
 .../rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.74.0.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.74.0.bb 
b/meta/recipes-devtools/rust/cargo_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.74.0.bb
rename to meta/recipes-devtools/rust/cargo_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.74.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.74.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index e8dafe59c9b0..83a0dbc15fae 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -11,7 +11,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187"
+SRC_URI[rust.sha256sum] = 
"b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.74.0.bb 
b/meta/recipes-devtools/rust/rust_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.74.0.bb
rename to meta/recipes-devtools/rust/rust_1.74.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193012): 
https://lists.openembedded.org/g/openembedded-core/message/193012
Mute This Topic: https://lists.openembedded.org/mt/103415642/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v4 00/10] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-29 Thread Alex Kiernan

This is the 1.74.1 rust series rebased to include a revert of
https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
which I'm pretty sure is what's causing our filename churn. I've checked
1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
which had the issue) and in both cases we're not generating the dirname
based prefix - hopefully that means that the interim commits are fine
too, if not we can do the step back through the commits to find the next
issue.

Changes in v4:
- Mark hello-rs as EXCLUDE_FROM_WORLD as it's not reproducible

Changes in v3:
- Add hello-rs as a replacement for the tests which used zvariant

Changes in v2:
- Skip zvariant based test rather than deleting it.

Alex Kiernan (10):
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath
inequality
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend
check
  meta-selftest: hello-rs: Simple rust test recipe
  devtool: selftest: Swap to hello-rs for crates testing
  zvariant: Drop recipe
  rust: Upgrade 1.71.1 -> 1.72.0
  rust: Upgrade 1.72.0 -> 1.72.1
  rust: Upgrade 1.72.1 -> 1.73.0
  rust: Upgrade 1.73.0 -> 1.74.0
  rust: Upgrade 1.74.0 -> 1.74.1

 .../hello-rs/hello-rs-crates.inc  |8 +
 .../hello-rs/0001-Greet-OE-Core.patch |   24 +
 .../hello-rs/hello-rs_0.1.0.bb|   22 +
 .../zvariant/zvariant-crates.inc  |  258 
 .../zvariant/zvariant-git-crates.inc  |   14 -
 .../0001-Tweak-zvariant-crate-config.patch| 1292 -
 .../zvariant/zvariant_3.12.0.bb   |   37 -
 meta/conf/distro/include/tcmode-default.inc   |2 +-
 meta/lib/oeqa/selftest/cases/devtool.py   |6 +-
 .../rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} |0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch |  164 ---
 ...0001-Don-t-use-LFS64-symbols-on-musl.patch |  163 +++
 ...e-absolute-paths-to-OUT_DIR-as-relat.patch |   67 +
 ...Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch |  122 ++
 ...efine-SOCK_SEQPACKET-in-common-place.patch |  114 --
 ...ine-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch |   41 +
 ...GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch |  205 +++
 ...-musl-Define-O_LARGEFILE-for-riscv32.patch |   32 +
 ...efine-SOCK_SEQPACKET-in-common-place.patch |  115 ++
 .../rust/files/getrandom-open64.patch |   50 -
 .../rust/files/hardcodepaths.patch|   14 +-
 .../rust/files/zlib-off64_t.patch |   17 +-
 ...ibstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} |0
 71.1.bb => rust-cross-canadian_1.74.1.bb} |0
 ...ust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} |0
 meta/recipes-devtools/rust/rust-snapshot.inc  |   64 +-
 meta/recipes-devtools/rust/rust-source.inc|   12 +-
 .../rust/{rust_1.71.1.bb => rust_1.74.1.bb}   |1 +
 28 files changed, 859 insertions(+), 1985 deletions(-)
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
 create mode 100644 
meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb
 rename meta/recipes-devtools/rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} (100%)
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Don-t-use-LFS64-symbols-on-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0002-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0003-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0004-musl-Define-O_LARGEFILE-for-riscv32.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 delete mode 100644 meta/recipes-devtools/rust/files/getrandom-open64.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.1.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.71

[OE-Core][PATCH v4 07/10] rust: Upgrade 1.72.0 -> 1.72.1

2023-12-29 Thread Alex Kiernan

https://blog.rust-lang.org/2023/09/19/Rust-1.72.1.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} | 0
 .../rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb}   | 0
 ...t-cross-canadian_1.72.0.bb => rust-cross-canadian_1.72.1.bb} | 0
 .../rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.0.bb => 
rust-cross-canadian_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.72.0.bb 
b/meta/recipes-devtools/rust/cargo_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.0.bb
rename to meta/recipes-devtools/rust/cargo_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.72.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.72.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 253a8436d2a7..ca3fcf9e884d 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014"
+SRC_URI[rust.sha256sum] = 
"aea58d962ff1c19521b9f587aad88285f0fd35b6b6738b031a7a15bb1b70a7c3"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.72.0.bb 
b/meta/recipes-devtools/rust/rust_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.72.0.bb
rename to meta/recipes-devtools/rust/rust_1.72.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193009): 
https://lists.openembedded.org/g/openembedded-core/message/193009
Mute This Topic: https://lists.openembedded.org/mt/103415639/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v4 08/10] rust: Upgrade 1.72.1 -> 1.73.0

2023-12-29 Thread Alex Kiernan

https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} |  0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 36 +-
 .../rust/files/hardcodepaths.patch|  8 ++-
 ...ibstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} |  0
 72.1.bb => rust-cross-canadian_1.73.0.bb} |  0
 ...ust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 68 ---
 meta/recipes-devtools/rust/rust-source.inc|  2 +-
 .../rust/{rust_1.72.1.bb => rust_1.73.0.bb}   |  0
 10 files changed, 55 insertions(+), 61 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.1.bb => 
rust-cross-canadian_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.1.bb => rust_1.73.0.bb} (100%)

diff --git a/meta/conf/distro/include/tcmode-default.inc 
b/meta/conf/distro/include/tcmode-default.inc
index f67b7be39c60..8960d9e0144e 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.5%"
 QEMUVERSION ?= "8.1%"
 GOVERSION ?= "1.20%"
 LLVMVERSION ?= "17.%"
-RUSTVERSION ?= "1.72%"
+RUSTVERSION ?= "1.73%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/rust/cargo_1.72.1.bb 
b/meta/recipes-devtools/rust/cargo_1.73.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.1.bb
rename to meta/recipes-devtools/rust/cargo_1.73.0.bb
diff --git 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
index dd23d09101ef..794ad804f0dc 100644
--- 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
+++ 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj 
  library/std/src/sys/unix/fs.rs | 27 ---
  3 files changed, 38 insertions(+), 12 deletions(-)
 
-Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs
-+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+--- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs
 rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 @@ -329,7 +329,14 @@ pub trait MetadataExt {
  impl MetadataExt for Metadata {
  #[allow(deprecated)]
@@ -39,10 +39,10 @@ Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
  }
  fn st_dev() -> u64 {
  self.as_inner().as_inner().st_dev as u64
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 @@ -124,9 +124,12 @@ impl FileDesc {
  }
  
@@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
  use libc::pwrite64;
  
  unsafe {
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
-@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
+@@ -39,9 +39,13 @@ use libc::{c_int, mode_t};
  all(target_os = "linux", target_env = "gnu")
  ))]
  use libc::c_char;
@@ -93,7 +93,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::fstatat64;
  #[cfg(any(
  target_os = "android",
-@@ -64,7 +68,7 @@ use libc::fstatat64;
+@@ -53,7 +57,7 @@ use libc::fstatat64;
  target_os = "vita",
  ))]
  use libc::readdir as readdir64;
@@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::readdir64;
  #[cfg(any(target_os = "emscripten", target_os = "l4re"))]
  use libc::readdir64_r;
-@@ -79,6 +83,7 @@ use libc::readdir64_r;
+@@ -68,6 +72,7 @@ us

[OE-Core][PATCH v4 05/10] zvariant: Drop recipe

2023-12-29 Thread Alex Kiernan

This fails to build with newer rust

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 .../zvariant/zvariant-crates.inc  |  258 
 .../zvariant/zvariant-git-crates.inc  |   14 -
 .../0001-Tweak-zvariant-crate-config.patch| 1292 -
 .../zvariant/zvariant_3.12.0.bb   |   37 -
 4 files changed, 1601 deletions(-)
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb

diff --git a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc 
b/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
deleted file mode 100644
index 3a9759c4a533..
--- a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
+++ /dev/null
@@ -1,258 +0,0 @@
-# Autogenerated with 'bitbake -c update_crates zvariant'
-
-# from Cargo.lock
-SRC_URI += " \
-crate://crates.io/anes/0.1.6;name=anes-0.1.6 \
-crate://crates.io/anyhow/1.0.70;name=anyhow-1.0.70 \
-crate://crates.io/arrayvec/0.7.2;name=arrayvec-0.7.2 \
-crate://crates.io/atty/0.2.14;name=atty-0.2.14 \
-crate://crates.io/autocfg/1.1.0;name=autocfg-1.1.0 \
-crate://crates.io/bitflags/1.3.2;name=bitflags-1.3.2 \
-crate://crates.io/bumpalo/3.12.0;name=bumpalo-3.12.0 \
-crate://crates.io/byteorder/1.4.3;name=byteorder-1.4.3 \
-crate://crates.io/cast/0.3.0;name=cast-0.3.0 \
-crate://crates.io/cfg-if/1.0.0;name=cfg-if-1.0.0 \
-crate://crates.io/chrono/0.4.24;name=chrono-0.4.24 \
-crate://crates.io/ciborium/0.2.0;name=ciborium-0.2.0 \
-crate://crates.io/ciborium-io/0.2.0;name=ciborium-io-0.2.0 \
-crate://crates.io/ciborium-ll/0.2.0;name=ciborium-ll-0.2.0 \
-crate://crates.io/clap/3.2.23;name=clap-3.2.23 \
-crate://crates.io/clap_lex/0.2.4;name=clap_lex-0.2.4 \
-crate://crates.io/criterion/0.4.0;name=criterion-0.4.0 \
-crate://crates.io/criterion-plot/0.5.0;name=criterion-plot-0.5.0 \
-crate://crates.io/crossbeam-channel/0.5.7;name=crossbeam-channel-0.5.7 \
-crate://crates.io/crossbeam-deque/0.8.3;name=crossbeam-deque-0.8.3 \
-crate://crates.io/crossbeam-epoch/0.9.14;name=crossbeam-epoch-0.9.14 \
-crate://crates.io/crossbeam-utils/0.8.15;name=crossbeam-utils-0.8.15 \
-crate://crates.io/either/1.8.1;name=either-1.8.1 \
-crate://crates.io/enumflags2/0.7.5;name=enumflags2-0.7.5 \
-crate://crates.io/enumflags2_derive/0.7.4;name=enumflags2_derive-0.7.4 \
-crate://crates.io/form_urlencoded/1.1.0;name=form_urlencoded-1.1.0 \
-crate://crates.io/futures-channel/0.3.27;name=futures-channel-0.3.27 \
-crate://crates.io/futures-core/0.3.27;name=futures-core-0.3.27 \
-crate://crates.io/futures-executor/0.3.27;name=futures-executor-0.3.27 \
-crate://crates.io/futures-macro/0.3.27;name=futures-macro-0.3.27 \
-crate://crates.io/futures-task/0.3.27;name=futures-task-0.3.27 \
-crate://crates.io/futures-util/0.3.27;name=futures-util-0.3.27 \
-crate://crates.io/getrandom/0.2.8;name=getrandom-0.2.8 \
-crate://crates.io/half/1.8.2;name=half-1.8.2 \
-crate://crates.io/hashbrown/0.12.3;name=hashbrown-0.12.3 \
-crate://crates.io/heck/0.3.3;name=heck-0.3.3 \
-crate://crates.io/hermit-abi/0.1.19;name=hermit-abi-0.1.19 \
-crate://crates.io/hermit-abi/0.2.6;name=hermit-abi-0.2.6 \
-crate://crates.io/idna/0.3.0;name=idna-0.3.0 \
-crate://crates.io/indexmap/1.9.2;name=indexmap-1.9.2 \
-crate://crates.io/itertools/0.9.0;name=itertools-0.9.0 \
-crate://crates.io/itertools/0.10.5;name=itertools-0.10.5 \
-crate://crates.io/itoa/1.0.6;name=itoa-1.0.6 \
-crate://crates.io/js-sys/0.3.61;name=js-sys-0.3.61 \
-crate://crates.io/lazy_static/1.4.0;name=lazy_static-1.4.0 \
-crate://crates.io/libc/0.2.140;name=libc-0.2.140 \
-crate://crates.io/log/0.4.17;name=log-0.4.17 \
-crate://crates.io/memchr/2.5.0;name=memchr-2.5.0 \
-crate://crates.io/memoffset/0.8.0;name=memoffset-0.8.0 \
-crate://crates.io/num-integer/0.1.45;name=num-integer-0.1.45 \
-crate://crates.io/num-traits/0.2.15;name=num-traits-0.2.15 \
-crate://crates.io/num_cpus/1.15.0;name=num_cpus-1.15.0 \
-crate://crates.io/once_cell/1.17.1;name=once_cell-1.17.1 \
-crate://crates.io/oorandom/11.1.3;name=oorandom-11.1.3 \
-crate://crates.io/os_str_bytes/6.5.0;name=os_str_bytes-6.5.0 \
-crate://crates.io/percent-encoding/2.2.0;name=percent-encoding-2.2.0 \
-crate://crates.io/pin-project-lite/0.2.9;name=pin-project-lite-0.2.9 \
-crate://crates.io/pin-utils/0.1.0;name=pin-utils-0.1.0 \
-crate://crates.io/pkg-config/0.3.26;name=pkg-config-0.3.26 \
-crate://crates.io/plotters/0.3.4;name=plotters-0.3.4 \
-crate://crates.io/plotters-backend/0.3.4;name=plotters-ba

[OE-Core][PATCH v4 03/10] meta-selftest: hello-rs: Simple rust test recipe

2023-12-29 Thread Alex Kiernan

Signed-off-by: Alex Kiernan 
---

Changes in v4:
- Mark hello-rs as EXCLUDE_FROM_WORLD as it's not reproducible

 .../hello-rs/hello-rs-crates.inc  |  8 +++
 .../hello-rs/0001-Greet-OE-Core.patch | 24 +++
 .../hello-rs/hello-rs_0.1.0.bb| 22 +
 3 files changed, 54 insertions(+)
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
 create mode 100644 
meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb

diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc 
b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
new file mode 100644
index ..9646482b2875
--- /dev/null
+++ b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
@@ -0,0 +1,8 @@
+# Autogenerated with 'bitbake -c update_crates hello-rs'
+
+# from Cargo.lock
+SRC_URI += " \
+crate://crates.io/figlet-rs/0.1.5 \
+"
+
+SRC_URI[figlet-rs-0.1.5.sha256sum] = 
"4742a071cd9694fc86f9fa1a08fa3e53d40cc899d7ee532295da2d085639fbc5"
diff --git 
a/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch 
b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
new file mode 100644
index ..7569ccef7bbb
--- /dev/null
+++ b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
@@ -0,0 +1,24 @@
+From 3aea1ece0ca6ac0bf0ffe42736827af22966f767 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan 
+Date: Wed, 27 Dec 2023 09:55:48 +
+Subject: [PATCH] Greet "OE-Core"
+
+Signed-off-by: Alex Kiernan 
+Upstream-Status: Inappropriate
+---
+ src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index f4a310758b19..224eca65c38d 100644
+--- a/src/main.rs
 b/src/main.rs
+@@ -3,7 +3,7 @@ use hello_lib::greet;
+ 
+ fn main() {
+ let standard_font = FIGfont::standard().unwrap();
+-let greeting = greet(None);
++let greeting = greet(Some("OE-Core"));
+ let figure = standard_font.convert();
+ println!("{}", figure.unwrap());
+ }
diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb 
b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
new file mode 100644
index ..9a136f29788e
--- /dev/null
+++ b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Simple hello world example"
+HOMEPAGE = "https://github.com/akiernan/hello-bin;
+LICENSE = "Unlicense"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680"
+
+SRC_URI = 
"git://github.com/akiernan/hello-bin.git;protocol=https;branch=main;subpath=rust
 \
+   file://0001-Greet-OE-Core.patch \
+   
git://github.com/akiernan/hello-lib.git;protocol=https;branch=main;name=hello-lib;destsuffix=hello-lib;type=git-dependency
 \
+  "
+SRCREV = "d3d096eda182644868f8e7458dcfa538ff637db3"
+
+SRCREV_FORMAT .= "_hello-lib"
+SRCREV_hello-lib = "59c84574e844617043cf337bc8fa537cf87ad8ae"
+
+S = "${WORKDIR}/rust"
+
+inherit cargo cargo-update-recipe-crates ptest-cargo
+
+# Remove this when the recipe is reproducible
+EXCLUDE_FROM_WORLD = "1"
+
+require ${BPN}-crates.inc
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193006): 
https://lists.openembedded.org/g/openembedded-core/message/193006
Mute This Topic: https://lists.openembedded.org/mt/103415636/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v4 04/10] devtool: selftest: Swap to hello-rs for crates testing

2023-12-29 Thread Alex Kiernan

zvariant fails to build with newer rust

Signed-off-by: Alex Kiernan 
---

(no changes since v3)

Changes in v3:
- Add hello-rs as a replacement for the tests which used zvariant

Changes in v2:
- Skip zvariant based test rather than deleting it.

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index cc28731402e7..a87772076946 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -928,7 +928,7 @@ class DevtoolModifyTests(DevtoolBase):
 #some crate:// in SRC_URI
 #others git:// in SRC_URI
 #cointains a patch
-testrecipe = 'zvariant'
+testrecipe = 'hello-rs'
 bb_vars = get_bb_vars(['SRC_URI', 'FILE', 'WORKDIR', 'CARGO_HOME'], 
testrecipe)
 recipefile = bb_vars['FILE']
 workdir = bb_vars['WORKDIR']
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193007): 
https://lists.openembedded.org/g/openembedded-core/message/193007
Mute This Topic: https://lists.openembedded.org/mt/103415637/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v4 02/10] devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend check

2023-12-29 Thread Alex Kiernan

The recipe being tested is in `testrecipe`, use that rather than the
literal `zvariant`.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index d733dd158106..cc28731402e7 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -958,7 +958,7 @@ class DevtoolModifyTests(DevtoolBase):
 result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir))
 self.assertExists(os.path.join(tempdir, 'Cargo.toml'), 'Extracted 
source could not be found')
 self.assertExists(os.path.join(self.workspacedir, 'conf', 
'layer.conf'), 'Workspace directory not created. devtool output: %s' % 
result.output)
-matches = glob.glob(os.path.join(self.workspacedir, 'appends', 
'zvariant_*.bbappend'))
+matches = glob.glob(os.path.join(self.workspacedir, 'appends', 
'%s_*.bbappend' % testrecipe))
 self.assertTrue(matches, 'bbappend not created')
 # Test devtool status
 result = runCmd('devtool status')
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193005): 
https://lists.openembedded.org/g/openembedded-core/message/193005
Mute This Topic: https://lists.openembedded.org/mt/103415635/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v4 01/10] devtool: selftest: Fix test_devtool_modify_git_crates_subpath inequality

2023-12-29 Thread Alex Kiernan

test_devtool_modify_git_crates_subpath expects 2 or more git URIs,
change the test from Greater to GreateEqual.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index 47353dadff93..d733dd158106 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -940,7 +940,7 @@ class DevtoolModifyTests(DevtoolBase):
   'This test expects the %s recipe to have a git uri with 
subpath' % testrecipe)
 self.assertTrue(any([uri.startswith('crate://') for uri in src_uri]),
 'This test expects the %s recipe to have some crates 
in its src uris' % testrecipe)
-self.assertGreater(sum(map(lambda x:x.startswith('git://'), src_uri)), 
2,
+self.assertGreaterEqual(sum(map(lambda x:x.startswith('git://'), 
src_uri)), 2,
'This test expects the %s recipe to have several 
git:// uris' % testrecipe)
 self.assertTrue(any([uri.startswith('file://') and '.patch' in uri for 
uri in src_uri]),
 'This test expects the %s recipe to have a patch in 
its src uris' % testrecipe)
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193004): 
https://lists.openembedded.org/g/openembedded-core/message/193004
Mute This Topic: https://lists.openembedded.org/mt/103415634/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH v3 03/10] meta-selftest: hello-rs: Simple rust test recipe

2023-12-29 Thread Alex Kiernan

I wondered if that was going to be the case, since we saw that with
zvariant too... I guess we exclude it :| I'll respin the patch set

On Fri, Dec 29, 2023 at 8:07 AM Alexandre Belloni
 wrote:
>
> Hello Alex,
>
> This fails the reproducibility test:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4159/steps/13/logs/stdio
>
> https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20231228-881dx278/packages/diff-html/
>
> On 28/12/2023 14:59:10+, Alex Kiernan wrote:
> > Signed-off-by: Alex Kiernan 
> > ---
> >
> > (no changes since v1)
> >
> >  .../hello-rs/hello-rs-crates.inc  |  8 +++
> >  .../hello-rs/0001-Greet-OE-Core.patch | 24 +++
> >  .../hello-rs/hello-rs_0.1.0.bb| 19 +++
> >  3 files changed, 51 insertions(+)
> >  create mode 100644 
> > meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
> >  create mode 100644 
> > meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
> >  create mode 100644 
> > meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
> >
> > diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc 
> > b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
> > new file mode 100644
> > index ..9646482b2875
> > --- /dev/null
> > +++ b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
> > @@ -0,0 +1,8 @@
> > +# Autogenerated with 'bitbake -c update_crates hello-rs'
> > +
> > +# from Cargo.lock
> > +SRC_URI += " \
> > +crate://crates.io/figlet-rs/0.1.5 \
> > +"
> > +
> > +SRC_URI[figlet-rs-0.1.5.sha256sum] = 
> > "4742a071cd9694fc86f9fa1a08fa3e53d40cc899d7ee532295da2d085639fbc5"
> > diff --git 
> > a/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch 
> > b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
> > new file mode 100644
> > index ..7569ccef7bbb
> > --- /dev/null
> > +++ 
> > b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
> > @@ -0,0 +1,24 @@
> > +From 3aea1ece0ca6ac0bf0ffe42736827af22966f767 Mon Sep 17 00:00:00 2001
> > +From: Alex Kiernan 
> > +Date: Wed, 27 Dec 2023 09:55:48 +
> > +Subject: [PATCH] Greet "OE-Core"
> > +
> > +Signed-off-by: Alex Kiernan 
> > +Upstream-Status: Inappropriate
> > +---
> > + src/main.rs | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/src/main.rs b/src/main.rs
> > +index f4a310758b19..224eca65c38d 100644
> > +--- a/src/main.rs
> >  b/src/main.rs
> > +@@ -3,7 +3,7 @@ use hello_lib::greet;
> > +
> > + fn main() {
> > + let standard_font = FIGfont::standard().unwrap();
> > +-let greeting = greet(None);
> > ++let greeting = greet(Some("OE-Core"));
> > + let figure = standard_font.convert();
> > + println!("{}", figure.unwrap());
> > + }
> > diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb 
> > b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
> > new file mode 100644
> > index ..0046b2ca0356
> > --- /dev/null
> > +++ b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
> > @@ -0,0 +1,19 @@
> > +SUMMARY = "Simple hello world example"
> > +HOMEPAGE = "https://github.com/akiernan/hello-bin;
> > +LICENSE = "Unlicense"
> > +LIC_FILES_CHKSUM = "file://LICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680"
> > +
> > +SRC_URI = 
> > "git://github.com/akiernan/hello-bin.git;protocol=https;branch=main;subpath=rust
> >  \
> > +   file://0001-Greet-OE-Core.patch \
> > +   
> > git://github.com/akiernan/hello-lib.git;protocol=https;branch=main;name=hello-lib;destsuffix=hello-lib;type=git-dependency
> >  \
> > +"
> > +SRCREV = "d3d096eda182644868f8e7458dcfa538ff637db3"
> > +
> > +SRCREV_FORMAT .= "_hello-lib"
> > +SRCREV_hello-lib = "59c84574e844617043cf337bc8fa537cf87ad8ae"
> > +
> > +S = "${WORKDIR}/rust"
> > +
> > +inherit cargo cargo-update-recipe-crates ptest-cargo
> > +
> > +require ${BPN}-crates.inc
> > --
> > 2.39.0
> >
>
> >
> > 
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com



-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#193001): 
https://lists.openembedded.org/g/openembedded-core/message/193001
Mute This Topic: https://lists.openembedded.org/mt/103401571/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v3 10/10] rust: Upgrade 1.74.0 -> 1.74.1

2023-12-28 Thread Alex Kiernan

https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} | 0
 .../rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb}   | 0
 ...t-cross-canadian_1.74.0.bb => rust-cross-canadian_1.74.1.bb} | 0
 .../rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.74.0.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.74.0.bb 
b/meta/recipes-devtools/rust/cargo_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.74.0.bb
rename to meta/recipes-devtools/rust/cargo_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.74.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.74.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index e8dafe59c9b0..83a0dbc15fae 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -11,7 +11,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187"
+SRC_URI[rust.sha256sum] = 
"b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.74.0.bb 
b/meta/recipes-devtools/rust/rust_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.74.0.bb
rename to meta/recipes-devtools/rust/rust_1.74.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192991): 
https://lists.openembedded.org/g/openembedded-core/message/192991
Mute This Topic: https://lists.openembedded.org/mt/103401578/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v3 08/10] rust: Upgrade 1.72.1 -> 1.73.0

2023-12-28 Thread Alex Kiernan

https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} |  0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 36 +-
 .../rust/files/hardcodepaths.patch|  8 ++-
 ...ibstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} |  0
 72.1.bb => rust-cross-canadian_1.73.0.bb} |  0
 ...ust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 68 ---
 meta/recipes-devtools/rust/rust-source.inc|  2 +-
 .../rust/{rust_1.72.1.bb => rust_1.73.0.bb}   |  0
 10 files changed, 55 insertions(+), 61 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.1.bb => 
rust-cross-canadian_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.1.bb => rust_1.73.0.bb} (100%)

diff --git a/meta/conf/distro/include/tcmode-default.inc 
b/meta/conf/distro/include/tcmode-default.inc
index f67b7be39c60..8960d9e0144e 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.5%"
 QEMUVERSION ?= "8.1%"
 GOVERSION ?= "1.20%"
 LLVMVERSION ?= "17.%"
-RUSTVERSION ?= "1.72%"
+RUSTVERSION ?= "1.73%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/rust/cargo_1.72.1.bb 
b/meta/recipes-devtools/rust/cargo_1.73.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.1.bb
rename to meta/recipes-devtools/rust/cargo_1.73.0.bb
diff --git 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
index dd23d09101ef..794ad804f0dc 100644
--- 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
+++ 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj 
  library/std/src/sys/unix/fs.rs | 27 ---
  3 files changed, 38 insertions(+), 12 deletions(-)
 
-Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs
-+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+--- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs
 rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 @@ -329,7 +329,14 @@ pub trait MetadataExt {
  impl MetadataExt for Metadata {
  #[allow(deprecated)]
@@ -39,10 +39,10 @@ Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
  }
  fn st_dev() -> u64 {
  self.as_inner().as_inner().st_dev as u64
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 @@ -124,9 +124,12 @@ impl FileDesc {
  }
  
@@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
  use libc::pwrite64;
  
  unsafe {
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
-@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
+@@ -39,9 +39,13 @@ use libc::{c_int, mode_t};
  all(target_os = "linux", target_env = "gnu")
  ))]
  use libc::c_char;
@@ -93,7 +93,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::fstatat64;
  #[cfg(any(
  target_os = "android",
-@@ -64,7 +68,7 @@ use libc::fstatat64;
+@@ -53,7 +57,7 @@ use libc::fstatat64;
  target_os = "vita",
  ))]
  use libc::readdir as readdir64;
@@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::readdir64;
  #[cfg(any(target_os = "emscripten", target_os = "l4re"))]
  use libc::readdir64_r;
-@@ -79,6 +83,7 @@ use libc::readdir64_r;
+@@ -68,6 +72,7 @@ us

[OE-Core][PATCH v3 07/10] rust: Upgrade 1.72.0 -> 1.72.1

2023-12-28 Thread Alex Kiernan

https://blog.rust-lang.org/2023/09/19/Rust-1.72.1.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} | 0
 .../rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb}   | 0
 ...t-cross-canadian_1.72.0.bb => rust-cross-canadian_1.72.1.bb} | 0
 .../rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.0.bb => 
rust-cross-canadian_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.72.0.bb 
b/meta/recipes-devtools/rust/cargo_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.0.bb
rename to meta/recipes-devtools/rust/cargo_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.72.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.72.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 253a8436d2a7..ca3fcf9e884d 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014"
+SRC_URI[rust.sha256sum] = 
"aea58d962ff1c19521b9f587aad88285f0fd35b6b6738b031a7a15bb1b70a7c3"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.72.0.bb 
b/meta/recipes-devtools/rust/rust_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.72.0.bb
rename to meta/recipes-devtools/rust/rust_1.72.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192988): 
https://lists.openembedded.org/g/openembedded-core/message/192988
Mute This Topic: https://lists.openembedded.org/mt/103401575/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v3 05/10] zvariant: Drop recipe

2023-12-28 Thread Alex Kiernan

This fails to build with newer rust

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 .../zvariant/zvariant-crates.inc  |  258 
 .../zvariant/zvariant-git-crates.inc  |   14 -
 .../0001-Tweak-zvariant-crate-config.patch| 1292 -
 .../zvariant/zvariant_3.12.0.bb   |   37 -
 4 files changed, 1601 deletions(-)
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb

diff --git a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc 
b/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
deleted file mode 100644
index 3a9759c4a533..
--- a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
+++ /dev/null
@@ -1,258 +0,0 @@
-# Autogenerated with 'bitbake -c update_crates zvariant'
-
-# from Cargo.lock
-SRC_URI += " \
-crate://crates.io/anes/0.1.6;name=anes-0.1.6 \
-crate://crates.io/anyhow/1.0.70;name=anyhow-1.0.70 \
-crate://crates.io/arrayvec/0.7.2;name=arrayvec-0.7.2 \
-crate://crates.io/atty/0.2.14;name=atty-0.2.14 \
-crate://crates.io/autocfg/1.1.0;name=autocfg-1.1.0 \
-crate://crates.io/bitflags/1.3.2;name=bitflags-1.3.2 \
-crate://crates.io/bumpalo/3.12.0;name=bumpalo-3.12.0 \
-crate://crates.io/byteorder/1.4.3;name=byteorder-1.4.3 \
-crate://crates.io/cast/0.3.0;name=cast-0.3.0 \
-crate://crates.io/cfg-if/1.0.0;name=cfg-if-1.0.0 \
-crate://crates.io/chrono/0.4.24;name=chrono-0.4.24 \
-crate://crates.io/ciborium/0.2.0;name=ciborium-0.2.0 \
-crate://crates.io/ciborium-io/0.2.0;name=ciborium-io-0.2.0 \
-crate://crates.io/ciborium-ll/0.2.0;name=ciborium-ll-0.2.0 \
-crate://crates.io/clap/3.2.23;name=clap-3.2.23 \
-crate://crates.io/clap_lex/0.2.4;name=clap_lex-0.2.4 \
-crate://crates.io/criterion/0.4.0;name=criterion-0.4.0 \
-crate://crates.io/criterion-plot/0.5.0;name=criterion-plot-0.5.0 \
-crate://crates.io/crossbeam-channel/0.5.7;name=crossbeam-channel-0.5.7 \
-crate://crates.io/crossbeam-deque/0.8.3;name=crossbeam-deque-0.8.3 \
-crate://crates.io/crossbeam-epoch/0.9.14;name=crossbeam-epoch-0.9.14 \
-crate://crates.io/crossbeam-utils/0.8.15;name=crossbeam-utils-0.8.15 \
-crate://crates.io/either/1.8.1;name=either-1.8.1 \
-crate://crates.io/enumflags2/0.7.5;name=enumflags2-0.7.5 \
-crate://crates.io/enumflags2_derive/0.7.4;name=enumflags2_derive-0.7.4 \
-crate://crates.io/form_urlencoded/1.1.0;name=form_urlencoded-1.1.0 \
-crate://crates.io/futures-channel/0.3.27;name=futures-channel-0.3.27 \
-crate://crates.io/futures-core/0.3.27;name=futures-core-0.3.27 \
-crate://crates.io/futures-executor/0.3.27;name=futures-executor-0.3.27 \
-crate://crates.io/futures-macro/0.3.27;name=futures-macro-0.3.27 \
-crate://crates.io/futures-task/0.3.27;name=futures-task-0.3.27 \
-crate://crates.io/futures-util/0.3.27;name=futures-util-0.3.27 \
-crate://crates.io/getrandom/0.2.8;name=getrandom-0.2.8 \
-crate://crates.io/half/1.8.2;name=half-1.8.2 \
-crate://crates.io/hashbrown/0.12.3;name=hashbrown-0.12.3 \
-crate://crates.io/heck/0.3.3;name=heck-0.3.3 \
-crate://crates.io/hermit-abi/0.1.19;name=hermit-abi-0.1.19 \
-crate://crates.io/hermit-abi/0.2.6;name=hermit-abi-0.2.6 \
-crate://crates.io/idna/0.3.0;name=idna-0.3.0 \
-crate://crates.io/indexmap/1.9.2;name=indexmap-1.9.2 \
-crate://crates.io/itertools/0.9.0;name=itertools-0.9.0 \
-crate://crates.io/itertools/0.10.5;name=itertools-0.10.5 \
-crate://crates.io/itoa/1.0.6;name=itoa-1.0.6 \
-crate://crates.io/js-sys/0.3.61;name=js-sys-0.3.61 \
-crate://crates.io/lazy_static/1.4.0;name=lazy_static-1.4.0 \
-crate://crates.io/libc/0.2.140;name=libc-0.2.140 \
-crate://crates.io/log/0.4.17;name=log-0.4.17 \
-crate://crates.io/memchr/2.5.0;name=memchr-2.5.0 \
-crate://crates.io/memoffset/0.8.0;name=memoffset-0.8.0 \
-crate://crates.io/num-integer/0.1.45;name=num-integer-0.1.45 \
-crate://crates.io/num-traits/0.2.15;name=num-traits-0.2.15 \
-crate://crates.io/num_cpus/1.15.0;name=num_cpus-1.15.0 \
-crate://crates.io/once_cell/1.17.1;name=once_cell-1.17.1 \
-crate://crates.io/oorandom/11.1.3;name=oorandom-11.1.3 \
-crate://crates.io/os_str_bytes/6.5.0;name=os_str_bytes-6.5.0 \
-crate://crates.io/percent-encoding/2.2.0;name=percent-encoding-2.2.0 \
-crate://crates.io/pin-project-lite/0.2.9;name=pin-project-lite-0.2.9 \
-crate://crates.io/pin-utils/0.1.0;name=pin-utils-0.1.0 \
-crate://crates.io/pkg-config/0.3.26;name=pkg-config-0.3.26 \
-crate://crates.io/plotters/0.3.4;name=plotters-0.3.4 \
-crate://crates.io/plotters-backend/0.3.4;name=plotters-ba

[OE-Core][PATCH v3 04/10] devtool: selftest: Swap to hello-rs for crates testing

2023-12-28 Thread Alex Kiernan

zvariant fails to build with newer rust

Signed-off-by: Alex Kiernan 
---

Changes in v3:
- Add hello-rs as a replacement for the tests which used zvariant

Changes in v2:
- Skip zvariant based test rather than deleting it.

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index cc28731402e7..a87772076946 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -928,7 +928,7 @@ class DevtoolModifyTests(DevtoolBase):
 #some crate:// in SRC_URI
 #others git:// in SRC_URI
 #cointains a patch
-testrecipe = 'zvariant'
+testrecipe = 'hello-rs'
 bb_vars = get_bb_vars(['SRC_URI', 'FILE', 'WORKDIR', 'CARGO_HOME'], 
testrecipe)
 recipefile = bb_vars['FILE']
 workdir = bb_vars['WORKDIR']
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192986): 
https://lists.openembedded.org/g/openembedded-core/message/192986
Mute This Topic: https://lists.openembedded.org/mt/103401572/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v3 03/10] meta-selftest: hello-rs: Simple rust test recipe

2023-12-28 Thread Alex Kiernan

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 .../hello-rs/hello-rs-crates.inc  |  8 +++
 .../hello-rs/0001-Greet-OE-Core.patch | 24 +++
 .../hello-rs/hello-rs_0.1.0.bb| 19 +++
 3 files changed, 51 insertions(+)
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
 create mode 100644 
meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb

diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc 
b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
new file mode 100644
index ..9646482b2875
--- /dev/null
+++ b/meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
@@ -0,0 +1,8 @@
+# Autogenerated with 'bitbake -c update_crates hello-rs'
+
+# from Cargo.lock
+SRC_URI += " \
+crate://crates.io/figlet-rs/0.1.5 \
+"
+
+SRC_URI[figlet-rs-0.1.5.sha256sum] = 
"4742a071cd9694fc86f9fa1a08fa3e53d40cc899d7ee532295da2d085639fbc5"
diff --git 
a/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch 
b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
new file mode 100644
index ..7569ccef7bbb
--- /dev/null
+++ b/meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
@@ -0,0 +1,24 @@
+From 3aea1ece0ca6ac0bf0ffe42736827af22966f767 Mon Sep 17 00:00:00 2001
+From: Alex Kiernan 
+Date: Wed, 27 Dec 2023 09:55:48 +
+Subject: [PATCH] Greet "OE-Core"
+
+Signed-off-by: Alex Kiernan 
+Upstream-Status: Inappropriate
+---
+ src/main.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.rs b/src/main.rs
+index f4a310758b19..224eca65c38d 100644
+--- a/src/main.rs
 b/src/main.rs
+@@ -3,7 +3,7 @@ use hello_lib::greet;
+ 
+ fn main() {
+ let standard_font = FIGfont::standard().unwrap();
+-let greeting = greet(None);
++let greeting = greet(Some("OE-Core"));
+ let figure = standard_font.convert();
+ println!("{}", figure.unwrap());
+ }
diff --git a/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb 
b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
new file mode 100644
index ..0046b2ca0356
--- /dev/null
+++ b/meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Simple hello world example"
+HOMEPAGE = "https://github.com/akiernan/hello-bin;
+LICENSE = "Unlicense"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7246f848faa4e9c9fc0ea91122d6e680"
+
+SRC_URI = 
"git://github.com/akiernan/hello-bin.git;protocol=https;branch=main;subpath=rust
 \
+   file://0001-Greet-OE-Core.patch \
+   
git://github.com/akiernan/hello-lib.git;protocol=https;branch=main;name=hello-lib;destsuffix=hello-lib;type=git-dependency
 \
+  "
+SRCREV = "d3d096eda182644868f8e7458dcfa538ff637db3"
+
+SRCREV_FORMAT .= "_hello-lib"
+SRCREV_hello-lib = "59c84574e844617043cf337bc8fa537cf87ad8ae"
+
+S = "${WORKDIR}/rust"
+
+inherit cargo cargo-update-recipe-crates ptest-cargo
+
+require ${BPN}-crates.inc
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192985): 
https://lists.openembedded.org/g/openembedded-core/message/192985
Mute This Topic: https://lists.openembedded.org/mt/103401571/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 0/6] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-28 Thread Alex Kiernan

On Wed, Dec 27, 2023 at 6:46 PM Alex Kiernan via
lists.openembedded.org 
wrote:
>
> On Tue, Dec 26, 2023 at 8:59 AM Alex Kiernan via
> lists.openembedded.org 
> wrote:
> >
> > On Mon, Dec 25, 2023 at 10:02 PM Richard Purdie
> >  wrote:
> > >
> > > On Mon, 2023-12-25 at 08:40 +, Richard Purdie via
> > > lists.openembedded.org wrote:
> > > > On Sun, 2023-12-24 at 23:09 +, Alex Kiernan wrote:
> > > > > This is the 1.74.1 rust series rebased to include a revert of
> > > > > https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
> > > > > which I'm pretty sure is what's causing our filename churn. I've 
> > > > > checked
> > > > > 1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
> > > > > which had the issue) and in both cases we're not generating the 
> > > > > dirname
> > > > > based prefix - hopefully that means that the interim commits are fine
> > > > > too, if not we can do the step back through the commits to find the 
> > > > > next
> > > > > issue.
> > > > >
> > > > > I've dropped the zvariant tests as upgrading it isn't useful (since it
> > > > > no longer includes git crate dependency) and spurious oe-selftest
> > > > > failures aren't helpful. I guess we need to include either something
> > > > > synthetic which tests git crates, or pull in
> > > > > https://github.com/jthornber/thin-provisioning-tools/ from
> > > > > meta-openembedded which includes a live example (though who knows for
> > > > > how long!)
> > > > >
> > > > > Assuming this does actually fix the reproducibility issue, I'll look 
> > > > > at
> > > > > how we fix the issue properly, rather than just reverting the commit
> > > > > which I think is our problem, but I'd like to try and get us back on 
> > > > > the
> > > > > rust release train if we can!
> > > > >
> > > > >
> > > > > Alex Kiernan (6):
> > > > >   meta-selftest: Drop zvariant recipe
> > > > >   rust: Upgrade 1.71.1 -> 1.72.0
> > > > >   rust: Upgrade 1.72.0 -> 1.72.1
> > > > >   rust: Upgrade 1.72.1 -> 1.73.0
> > > > >   rust: Upgrade 1.73.0 -> 1.74.0
> > > > >   rust: Upgrade 1.74.0 -> 1.74.1
> > > >
> > > > Sounds like a good plan, I've started a reproducibility test:
> > > >
> > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4142
> > > >
> > > > With zvariant, we might be better replacing with a synthetic example
> > > > for testing purposes?
> > >
> > > That build went green so I ran an a-full to double check and check
> > > everything else:
> > >
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6374
> > >
> > > Curl ptest warning was the only issue (unrelated) so it also looks
> > > good.
> > >
> > > Looks like you might have tracked down the issue, nice work! :)
> > >
> > > Should I merge this as is or is there something we should do first now
> > > we know where the issue is?
> > >
> >
> > Obviously we need the upstream pieces sorting, but I don't think
> > that's a blocker to merging here. Just ripping out zvariant and all
> > the associated infrastructure I guess wants fixing first, though I
> > think don't we need anything more complicated than:
> >
> > https://github.com/akiernan/hello-rs
> >
> > I'll try and have a look at that later.
> >
>
> The pieces I have are:
>
> https://github.com/akiernan/hello-bin
> https://github.com/akiernan/hello-lib
>
> Which build/work fine, but the swapping it in for the zvariant tests
> fails with things totally unrelated to upgrading rust, which suggest
> we have more stuff to fix, so after two days looking at it, on and
> off, I think just skipping the relevant test is the right thing for
> now.
>

Unsurprisingly this was a complete idiot mistake I'd made... step away
from it and look at it fresh and its obvious why it didn't work! Will
send a v3 w/ a replacement for zvariant.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192983): 
https://lists.openembedded.org/g/openembedded-core/message/192983
Mute This Topic: https://lists.openembedded.org/mt/103354255/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v3 02/10] devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend check

2023-12-28 Thread Alex Kiernan

The recipe being tested is in `testrecipe`, use that rather than the
literal `zvariant`.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index d733dd158106..cc28731402e7 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -958,7 +958,7 @@ class DevtoolModifyTests(DevtoolBase):
 result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir))
 self.assertExists(os.path.join(tempdir, 'Cargo.toml'), 'Extracted 
source could not be found')
 self.assertExists(os.path.join(self.workspacedir, 'conf', 
'layer.conf'), 'Workspace directory not created. devtool output: %s' % 
result.output)
-matches = glob.glob(os.path.join(self.workspacedir, 'appends', 
'zvariant_*.bbappend'))
+matches = glob.glob(os.path.join(self.workspacedir, 'appends', 
'%s_*.bbappend' % testrecipe))
 self.assertTrue(matches, 'bbappend not created')
 # Test devtool status
 result = runCmd('devtool status')
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192984): 
https://lists.openembedded.org/g/openembedded-core/message/192984
Mute This Topic: https://lists.openembedded.org/mt/103401570/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v3 01/10] devtool: selftest: Fix test_devtool_modify_git_crates_subpath inequality

2023-12-28 Thread Alex Kiernan

test_devtool_modify_git_crates_subpath expects 2 or more git URIs,
change the test from Greater to GreateEqual.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index 47353dadff93..d733dd158106 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -940,7 +940,7 @@ class DevtoolModifyTests(DevtoolBase):
   'This test expects the %s recipe to have a git uri with 
subpath' % testrecipe)
 self.assertTrue(any([uri.startswith('crate://') for uri in src_uri]),
 'This test expects the %s recipe to have some crates 
in its src uris' % testrecipe)
-self.assertGreater(sum(map(lambda x:x.startswith('git://'), src_uri)), 
2,
+self.assertGreaterEqual(sum(map(lambda x:x.startswith('git://'), 
src_uri)), 2,
'This test expects the %s recipe to have several 
git:// uris' % testrecipe)
 self.assertTrue(any([uri.startswith('file://') and '.patch' in uri for 
uri in src_uri]),
 'This test expects the %s recipe to have a patch in 
its src uris' % testrecipe)
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192982): 
https://lists.openembedded.org/g/openembedded-core/message/192982
Mute This Topic: https://lists.openembedded.org/mt/103401569/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v3 00/10] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-28 Thread Alex Kiernan

This is the 1.74.1 rust series rebased to include a revert of
https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
which I'm pretty sure is what's causing our filename churn. I've checked
1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
which had the issue) and in both cases we're not generating the dirname
based prefix - hopefully that means that the interim commits are fine
too, if not we can do the step back through the commits to find the next
issue.

Changes in v3:
- Add hello-rs as a replacement for the tests which used zvariant

Changes in v2:
- Skip zvariant based test rather than deleting it.

Alex Kiernan (10):
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath
inequality
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend
check
  meta-selftest: hello-rs: Simple rust test recipe
  devtool: selftest: Swap to hello-rs for crates testing
  zvariant: Drop recipe
  rust: Upgrade 1.71.1 -> 1.72.0
  rust: Upgrade 1.72.0 -> 1.72.1
  rust: Upgrade 1.72.1 -> 1.73.0
  rust: Upgrade 1.73.0 -> 1.74.0
  rust: Upgrade 1.74.0 -> 1.74.1

 .../hello-rs/hello-rs-crates.inc  |8 +
 .../hello-rs/0001-Greet-OE-Core.patch |   24 +
 .../hello-rs/hello-rs_0.1.0.bb|   19 +
 .../zvariant/zvariant-crates.inc  |  258 
 .../zvariant/zvariant-git-crates.inc  |   14 -
 .../0001-Tweak-zvariant-crate-config.patch| 1292 -
 .../zvariant/zvariant_3.12.0.bb   |   37 -
 meta/conf/distro/include/tcmode-default.inc   |2 +-
 meta/lib/oeqa/selftest/cases/devtool.py   |6 +-
 .../rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} |0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch |  164 ---
 ...0001-Don-t-use-LFS64-symbols-on-musl.patch |  163 +++
 ...e-absolute-paths-to-OUT_DIR-as-relat.patch |   67 +
 ...Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch |  122 ++
 ...efine-SOCK_SEQPACKET-in-common-place.patch |  114 --
 ...ine-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch |   41 +
 ...GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch |  205 +++
 ...-musl-Define-O_LARGEFILE-for-riscv32.patch |   32 +
 ...efine-SOCK_SEQPACKET-in-common-place.patch |  115 ++
 .../rust/files/getrandom-open64.patch |   50 -
 .../rust/files/hardcodepaths.patch|   14 +-
 .../rust/files/zlib-off64_t.patch |   17 +-
 ...ibstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} |0
 71.1.bb => rust-cross-canadian_1.74.1.bb} |0
 ...ust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} |0
 meta/recipes-devtools/rust/rust-snapshot.inc  |   64 +-
 meta/recipes-devtools/rust/rust-source.inc|   12 +-
 .../rust/{rust_1.71.1.bb => rust_1.74.1.bb}   |1 +
 28 files changed, 856 insertions(+), 1985 deletions(-)
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs-crates.inc
 create mode 100644 
meta-selftest/recipes-extended/hello-rs/hello-rs/0001-Greet-OE-Core.patch
 create mode 100644 meta-selftest/recipes-extended/hello-rs/hello-rs_0.1.0.bb
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb
 rename meta/recipes-devtools/rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} (100%)
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Don-t-use-LFS64-symbols-on-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0002-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0003-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0004-musl-Define-O_LARGEFILE-for-riscv32.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 delete mode 100644 meta/recipes-devtools/rust/files/getrandom-open64.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.1.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.71.1.bb => rust_1.74.1.bb} (99%)

-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all m

Re: [OE-Core][PATCH 0/6] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-27 Thread Alex Kiernan

On Tue, Dec 26, 2023 at 8:59 AM Alex Kiernan via
lists.openembedded.org 
wrote:
>
> On Mon, Dec 25, 2023 at 10:02 PM Richard Purdie
>  wrote:
> >
> > On Mon, 2023-12-25 at 08:40 +, Richard Purdie via
> > lists.openembedded.org wrote:
> > > On Sun, 2023-12-24 at 23:09 +, Alex Kiernan wrote:
> > > > This is the 1.74.1 rust series rebased to include a revert of
> > > > https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
> > > > which I'm pretty sure is what's causing our filename churn. I've checked
> > > > 1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
> > > > which had the issue) and in both cases we're not generating the dirname
> > > > based prefix - hopefully that means that the interim commits are fine
> > > > too, if not we can do the step back through the commits to find the next
> > > > issue.
> > > >
> > > > I've dropped the zvariant tests as upgrading it isn't useful (since it
> > > > no longer includes git crate dependency) and spurious oe-selftest
> > > > failures aren't helpful. I guess we need to include either something
> > > > synthetic which tests git crates, or pull in
> > > > https://github.com/jthornber/thin-provisioning-tools/ from
> > > > meta-openembedded which includes a live example (though who knows for
> > > > how long!)
> > > >
> > > > Assuming this does actually fix the reproducibility issue, I'll look at
> > > > how we fix the issue properly, rather than just reverting the commit
> > > > which I think is our problem, but I'd like to try and get us back on the
> > > > rust release train if we can!
> > > >
> > > >
> > > > Alex Kiernan (6):
> > > >   meta-selftest: Drop zvariant recipe
> > > >   rust: Upgrade 1.71.1 -> 1.72.0
> > > >   rust: Upgrade 1.72.0 -> 1.72.1
> > > >   rust: Upgrade 1.72.1 -> 1.73.0
> > > >   rust: Upgrade 1.73.0 -> 1.74.0
> > > >   rust: Upgrade 1.74.0 -> 1.74.1
> > >
> > > Sounds like a good plan, I've started a reproducibility test:
> > >
> > > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4142
> > >
> > > With zvariant, we might be better replacing with a synthetic example
> > > for testing purposes?
> >
> > That build went green so I ran an a-full to double check and check
> > everything else:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6374
> >
> > Curl ptest warning was the only issue (unrelated) so it also looks
> > good.
> >
> > Looks like you might have tracked down the issue, nice work! :)
> >
> > Should I merge this as is or is there something we should do first now
> > we know where the issue is?
> >
>
> Obviously we need the upstream pieces sorting, but I don't think
> that's a blocker to merging here. Just ripping out zvariant and all
> the associated infrastructure I guess wants fixing first, though I
> think don't we need anything more complicated than:
>
> https://github.com/akiernan/hello-rs
>
> I'll try and have a look at that later.
>

The pieces I have are:

https://github.com/akiernan/hello-bin
https://github.com/akiernan/hello-lib

Which build/work fine, but the swapping it in for the zvariant tests
fails with things totally unrelated to upgrading rust, which suggest
we have more stuff to fix, so after two days looking at it, on and
off, I think just skipping the relevant test is the right thing for
now.

1.75.0 lands tomorrow, and from a quick test breaks everything again :|

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192966): 
https://lists.openembedded.org/g/openembedded-core/message/192966
Mute This Topic: https://lists.openembedded.org/mt/103354255/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 8/8] rust: Upgrade 1.74.0 -> 1.74.1

2023-12-27 Thread Alex Kiernan

https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html

Signed-off-by: Alex Kiernan 
---

Changes in v2:
- Skip zvariant based test rather than deleting it.

 meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} | 0
 .../rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb}   | 0
 ...t-cross-canadian_1.74.0.bb => rust-cross-canadian_1.74.1.bb} | 0
 .../rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.74.0.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.74.0.bb 
b/meta/recipes-devtools/rust/cargo_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.74.0.bb
rename to meta/recipes-devtools/rust/cargo_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.74.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.74.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index e8dafe59c9b0..83a0dbc15fae 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -11,7 +11,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187"
+SRC_URI[rust.sha256sum] = 
"b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.74.0.bb 
b/meta/recipes-devtools/rust/rust_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.74.0.bb
rename to meta/recipes-devtools/rust/rust_1.74.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192964): 
https://lists.openembedded.org/g/openembedded-core/message/192964
Mute This Topic: https://lists.openembedded.org/mt/103389171/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 6/8] rust: Upgrade 1.72.1 -> 1.73.0

2023-12-27 Thread Alex Kiernan

https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} |  0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 36 +-
 .../rust/files/hardcodepaths.patch|  8 ++-
 ...ibstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} |  0
 72.1.bb => rust-cross-canadian_1.73.0.bb} |  0
 ...ust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 68 ---
 meta/recipes-devtools/rust/rust-source.inc|  2 +-
 .../rust/{rust_1.72.1.bb => rust_1.73.0.bb}   |  0
 10 files changed, 55 insertions(+), 61 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.1.bb => 
rust-cross-canadian_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.1.bb => rust_1.73.0.bb} (100%)

diff --git a/meta/conf/distro/include/tcmode-default.inc 
b/meta/conf/distro/include/tcmode-default.inc
index f67b7be39c60..8960d9e0144e 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.5%"
 QEMUVERSION ?= "8.1%"
 GOVERSION ?= "1.20%"
 LLVMVERSION ?= "17.%"
-RUSTVERSION ?= "1.72%"
+RUSTVERSION ?= "1.73%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/rust/cargo_1.72.1.bb 
b/meta/recipes-devtools/rust/cargo_1.73.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.1.bb
rename to meta/recipes-devtools/rust/cargo_1.73.0.bb
diff --git 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
index dd23d09101ef..794ad804f0dc 100644
--- 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
+++ 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj 
  library/std/src/sys/unix/fs.rs | 27 ---
  3 files changed, 38 insertions(+), 12 deletions(-)
 
-Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs
-+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+--- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs
 rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 @@ -329,7 +329,14 @@ pub trait MetadataExt {
  impl MetadataExt for Metadata {
  #[allow(deprecated)]
@@ -39,10 +39,10 @@ Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
  }
  fn st_dev() -> u64 {
  self.as_inner().as_inner().st_dev as u64
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 @@ -124,9 +124,12 @@ impl FileDesc {
  }
  
@@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
  use libc::pwrite64;
  
  unsafe {
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
-@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
+@@ -39,9 +39,13 @@ use libc::{c_int, mode_t};
  all(target_os = "linux", target_env = "gnu")
  ))]
  use libc::c_char;
@@ -93,7 +93,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::fstatat64;
  #[cfg(any(
  target_os = "android",
-@@ -64,7 +68,7 @@ use libc::fstatat64;
+@@ -53,7 +57,7 @@ use libc::fstatat64;
  target_os = "vita",
  ))]
  use libc::readdir as readdir64;
@@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::readdir64;
  #[cfg(any(target_os = "emscripten", target_os = "l4re"))]
  use libc::readdir64_r;
-@@ -79,6 +83,7 @@ use libc::readdir64_r;
+@@ -68,6 +72,7 @@ us

[OE-Core][PATCH v2 5/8] rust: Upgrade 1.72.0 -> 1.72.1

2023-12-27 Thread Alex Kiernan

https://blog.rust-lang.org/2023/09/19/Rust-1.72.1.html

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} | 0
 .../rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb}   | 0
 ...t-cross-canadian_1.72.0.bb => rust-cross-canadian_1.72.1.bb} | 0
 .../rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.0.bb => 
rust-cross-canadian_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.72.0.bb 
b/meta/recipes-devtools/rust/cargo_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.0.bb
rename to meta/recipes-devtools/rust/cargo_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.72.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.72.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 253a8436d2a7..ca3fcf9e884d 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014"
+SRC_URI[rust.sha256sum] = 
"aea58d962ff1c19521b9f587aad88285f0fd35b6b6738b031a7a15bb1b70a7c3"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.72.0.bb 
b/meta/recipes-devtools/rust/rust_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.72.0.bb
rename to meta/recipes-devtools/rust/rust_1.72.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192961): 
https://lists.openembedded.org/g/openembedded-core/message/192961
Mute This Topic: https://lists.openembedded.org/mt/103389167/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 0/8] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-27 Thread Alex Kiernan

This is the 1.74.1 rust series rebased to include a revert of
https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
which I'm pretty sure is what's causing our filename churn. I've checked
1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
which had the issue) and in both cases we're not generating the dirname
based prefix - hopefully that means that the interim commits are fine
too, if not we can do the step back through the commits to find the next
issue.

I've skipped the zvariant tests as upgrading it isn't useful (since it
no longer includes git crate dependency) and spurious oe-selftest
failures aren't helpful. The right fix here is to include something
synthetic which tests git crates, but there appear to be other issues
that exposes in the infrastructure here.

Changes in v2:
- Skip zvariant based test rather than deleting it.

Alex Kiernan (8):
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath
inequality
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend
check
  devtool: selftest: Skip test_devtool_modify_git_crates_subpath
  rust: Upgrade 1.71.1 -> 1.72.0
  rust: Upgrade 1.72.0 -> 1.72.1
  rust: Upgrade 1.72.1 -> 1.73.0
  rust: Upgrade 1.73.0 -> 1.74.0
  rust: Upgrade 1.74.0 -> 1.74.1

 meta/conf/distro/include/tcmode-default.inc   |   2 +-
 meta/lib/oeqa/selftest/cases/devtool.py   |   6 +-
 .../rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} |   0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 164 --
 ...0001-Don-t-use-LFS64-symbols-on-musl.patch | 163 ++
 ...e-absolute-paths-to-OUT_DIR-as-relat.patch |  67 ++
 ...Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch | 122 +++
 ...efine-SOCK_SEQPACKET-in-common-place.patch | 114 --
 ...ine-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch |  41 
 ...GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch | 205 ++
 ...-musl-Define-O_LARGEFILE-for-riscv32.patch |  32 +++
 ...efine-SOCK_SEQPACKET-in-common-place.patch | 115 ++
 .../rust/files/getrandom-open64.patch |  50 -
 .../rust/files/hardcodepaths.patch|  14 +-
 .../rust/files/zlib-off64_t.patch |  17 +-
 ...ibstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} |   0
 71.1.bb => rust-cross-canadian_1.74.1.bb} |   0
 ...ust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} |   0
 meta/recipes-devtools/rust/rust-snapshot.inc  |  64 +++---
 meta/recipes-devtools/rust/rust-source.inc|  12 +-
 .../rust/{rust_1.71.1.bb => rust_1.74.1.bb}   |   1 +
 21 files changed, 806 insertions(+), 383 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} (100%)
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Don-t-use-LFS64-symbols-on-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0002-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0003-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0004-musl-Define-O_LARGEFILE-for-riscv32.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 delete mode 100644 meta/recipes-devtools/rust/files/getrandom-open64.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.1.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.71.1.bb => rust_1.74.1.bb} (99%)

-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192957): 
https://lists.openembedded.org/g/openembedded-core/message/192957
Mute This Topic: https://lists.openembedded.org/mt/103389161/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 3/8] devtool: selftest: Skip test_devtool_modify_git_crates_subpath

2023-12-27 Thread Alex Kiernan

This fails to build upgrading rust and whilst the upgraded recipe works,
it no longer includes the essential things tested; skip it for now.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/devtool.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index cc28731402e7..291530e0a581 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -918,6 +918,8 @@ class DevtoolModifyTests(DevtoolBase):
 bitbake(testrecipe)
 
 def test_devtool_modify_git_crates_subpath(self):
+self.skipTest("zvariant tests fail after rust upgrade.")
+
 # This tests two things in devtool context:
 #   - that we support local git dependencies for cargo based recipe
 #   - that we support patches in SRC_URI when git url contains subpath 
parameter
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192960): 
https://lists.openembedded.org/g/openembedded-core/message/192960
Mute This Topic: https://lists.openembedded.org/mt/103389165/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 1/8] devtool: selftest: Fix test_devtool_modify_git_crates_subpath inequality

2023-12-27 Thread Alex Kiernan

test_devtool_modify_git_crates_subpath expects 2 or more git URIs,
change the test from Greater to GreateEqual.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index 47353dadff93..d733dd158106 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -940,7 +940,7 @@ class DevtoolModifyTests(DevtoolBase):
   'This test expects the %s recipe to have a git uri with 
subpath' % testrecipe)
 self.assertTrue(any([uri.startswith('crate://') for uri in src_uri]),
 'This test expects the %s recipe to have some crates 
in its src uris' % testrecipe)
-self.assertGreater(sum(map(lambda x:x.startswith('git://'), src_uri)), 
2,
+self.assertGreaterEqual(sum(map(lambda x:x.startswith('git://'), 
src_uri)), 2,
'This test expects the %s recipe to have several 
git:// uris' % testrecipe)
 self.assertTrue(any([uri.startswith('file://') and '.patch' in uri for 
uri in src_uri]),
 'This test expects the %s recipe to have a patch in 
its src uris' % testrecipe)
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192958): 
https://lists.openembedded.org/g/openembedded-core/message/192958
Mute This Topic: https://lists.openembedded.org/mt/103389162/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 2/8] devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend check

2023-12-27 Thread Alex Kiernan

The recipe being tested is in `testrecipe`, use that rather than the
literal `zvariant`.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py 
b/meta/lib/oeqa/selftest/cases/devtool.py
index d733dd158106..cc28731402e7 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -958,7 +958,7 @@ class DevtoolModifyTests(DevtoolBase):
 result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir))
 self.assertExists(os.path.join(tempdir, 'Cargo.toml'), 'Extracted 
source could not be found')
 self.assertExists(os.path.join(self.workspacedir, 'conf', 
'layer.conf'), 'Workspace directory not created. devtool output: %s' % 
result.output)
-matches = glob.glob(os.path.join(self.workspacedir, 'appends', 
'zvariant_*.bbappend'))
+matches = glob.glob(os.path.join(self.workspacedir, 'appends', 
'%s_*.bbappend' % testrecipe))
 self.assertTrue(matches, 'bbappend not created')
 # Test devtool status
 result = runCmd('devtool status')
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192959): 
https://lists.openembedded.org/g/openembedded-core/message/192959
Mute This Topic: https://lists.openembedded.org/mt/103389164/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 00/10] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-27 Thread Alex Kiernan

This is the 1.74.1 rust series rebased to include a revert of
https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
which I'm pretty sure is what's causing our filename churn. I've checked
1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
which had the issue) and in both cases we're not generating the dirname
based prefix - hopefully that means that the interim commits are fine
too, if not we can do the step back through the commits to find the next
issue.

I've skipped the zvariant tests as upgrading it isn't useful (since it
no longer includes git crate dependency) and spurious oe-selftest
failures aren't helpful. The right fix here is to include something
synthetic which tests git crates, but there appear to be other issues
that exposes in the infrastructure here.

Changes in v2:
- Skip zvariant based test rather than deleting it.

Alex Kiernan (10):
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath
inequality
  devtool: selftest: Fix test_devtool_modify_git_crates_subpath bbappend
check
  devtool: selftest: Skip test_devtool_modify_git_crates_subpath
  rust: Upgrade 1.71.1 -> 1.72.0
  rust: Upgrade 1.72.0 -> 1.72.1
  rust: Upgrade 1.72.1 -> 1.73.0
  rust: Upgrade 1.73.0 -> 1.74.0
  rust: Upgrade 1.74.0 -> 1.74.1
  cargo-update-recipe-crates: Start search in CARGO_LOCK_PATH
  rust: Move RUST_DIST_SERVER to rust-config.inc

 .../cargo-update-recipe-crates.bbclass|   4 +-
 meta/conf/distro/include/tcmode-default.inc   |   2 +-
 meta/lib/oeqa/selftest/cases/devtool.py   |   6 +-
 .../rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} |   0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 164 --
 ...0001-Don-t-use-LFS64-symbols-on-musl.patch | 163 ++
 ...e-absolute-paths-to-OUT_DIR-as-relat.patch |  67 ++
 ...Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch | 122 +++
 ...efine-SOCK_SEQPACKET-in-common-place.patch | 114 --
 ...ine-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch |  41 
 ...GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch | 205 ++
 ...-musl-Define-O_LARGEFILE-for-riscv32.patch |  32 +++
 ...efine-SOCK_SEQPACKET-in-common-place.patch | 115 ++
 .../rust/files/getrandom-open64.patch |  50 -
 .../rust/files/hardcodepaths.patch|  14 +-
 .../rust/files/zlib-off64_t.patch |  17 +-
 ...ibstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} |   0
 meta/recipes-devtools/rust/rust-config.inc|   1 +
 71.1.bb => rust-cross-canadian_1.74.1.bb} |   0
 ...ust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} |   0
 meta/recipes-devtools/rust/rust-snapshot.inc  |  66 +++---
 meta/recipes-devtools/rust/rust-source.inc|  14 +-
 .../rust/{rust_1.71.1.bb => rust_1.74.1.bb}   |  12 +-
 23 files changed, 820 insertions(+), 389 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} (100%)
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Don-t-use-LFS64-symbols-on-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0002-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0003-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0004-musl-Define-O_LARGEFILE-for-riscv32.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 delete mode 100644 meta/recipes-devtools/rust/files/getrandom-open64.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} 
(100%)
 create mode 100644 meta/recipes-devtools/rust/rust-config.inc
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.1.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.71.1.bb => rust_1.74.1.bb} (98%)

-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192956): 
https://lists.openembedded.org/g/openembedded-core/message/192956
Mute This Topic: https://lists.openembedded.org/mt/103389145/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 0/6] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-26 Thread Alex Kiernan

On Mon, Dec 25, 2023 at 10:02 PM Richard Purdie
 wrote:
>
> On Mon, 2023-12-25 at 08:40 +, Richard Purdie via
> lists.openembedded.org wrote:
> > On Sun, 2023-12-24 at 23:09 +0000, Alex Kiernan wrote:
> > > This is the 1.74.1 rust series rebased to include a revert of
> > > https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
> > > which I'm pretty sure is what's causing our filename churn. I've checked
> > > 1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
> > > which had the issue) and in both cases we're not generating the dirname
> > > based prefix - hopefully that means that the interim commits are fine
> > > too, if not we can do the step back through the commits to find the next
> > > issue.
> > >
> > > I've dropped the zvariant tests as upgrading it isn't useful (since it
> > > no longer includes git crate dependency) and spurious oe-selftest
> > > failures aren't helpful. I guess we need to include either something
> > > synthetic which tests git crates, or pull in
> > > https://github.com/jthornber/thin-provisioning-tools/ from
> > > meta-openembedded which includes a live example (though who knows for
> > > how long!)
> > >
> > > Assuming this does actually fix the reproducibility issue, I'll look at
> > > how we fix the issue properly, rather than just reverting the commit
> > > which I think is our problem, but I'd like to try and get us back on the
> > > rust release train if we can!
> > >
> > >
> > > Alex Kiernan (6):
> > >   meta-selftest: Drop zvariant recipe
> > >   rust: Upgrade 1.71.1 -> 1.72.0
> > >   rust: Upgrade 1.72.0 -> 1.72.1
> > >   rust: Upgrade 1.72.1 -> 1.73.0
> > >   rust: Upgrade 1.73.0 -> 1.74.0
> > >   rust: Upgrade 1.74.0 -> 1.74.1
> >
> > Sounds like a good plan, I've started a reproducibility test:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4142
> >
> > With zvariant, we might be better replacing with a synthetic example
> > for testing purposes?
>
> That build went green so I ran an a-full to double check and check
> everything else:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/6374
>
> Curl ptest warning was the only issue (unrelated) so it also looks
> good.
>
> Looks like you might have tracked down the issue, nice work! :)
>
> Should I merge this as is or is there something we should do first now
> we know where the issue is?
>

Obviously we need the upstream pieces sorting, but I don't think
that's a blocker to merging here. Just ripping out zvariant and all
the associated infrastructure I guess wants fixing first, though I
think don't we need anything more complicated than:

https://github.com/akiernan/hello-rs

I'll try and have a look at that later.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192908): 
https://lists.openembedded.org/g/openembedded-core/message/192908
Mute This Topic: https://lists.openembedded.org/mt/103354255/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 1/6] meta-selftest: Drop zvariant recipe

2023-12-24 Thread Alex Kiernan

This now fails as part of upgrading rust and whilst upgrading the recipe
resolves the build time issue, the upgraded recipe no longer tests the
git crate handling.

Signed-off-by: Alex Kiernan 
---

 .../zvariant/zvariant-crates.inc  |  258 
 .../zvariant/zvariant-git-crates.inc  |   14 -
 .../0001-Tweak-zvariant-crate-config.patch| 1292 -
 .../zvariant/zvariant_3.12.0.bb   |   37 -
 meta/lib/oeqa/selftest/cases/devtool.py   |   93 --
 5 files changed, 1694 deletions(-)
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb

diff --git a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc 
b/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
deleted file mode 100644
index 3a9759c4a533..
--- a/meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
+++ /dev/null
@@ -1,258 +0,0 @@
-# Autogenerated with 'bitbake -c update_crates zvariant'
-
-# from Cargo.lock
-SRC_URI += " \
-crate://crates.io/anes/0.1.6;name=anes-0.1.6 \
-crate://crates.io/anyhow/1.0.70;name=anyhow-1.0.70 \
-crate://crates.io/arrayvec/0.7.2;name=arrayvec-0.7.2 \
-crate://crates.io/atty/0.2.14;name=atty-0.2.14 \
-crate://crates.io/autocfg/1.1.0;name=autocfg-1.1.0 \
-crate://crates.io/bitflags/1.3.2;name=bitflags-1.3.2 \
-crate://crates.io/bumpalo/3.12.0;name=bumpalo-3.12.0 \
-crate://crates.io/byteorder/1.4.3;name=byteorder-1.4.3 \
-crate://crates.io/cast/0.3.0;name=cast-0.3.0 \
-crate://crates.io/cfg-if/1.0.0;name=cfg-if-1.0.0 \
-crate://crates.io/chrono/0.4.24;name=chrono-0.4.24 \
-crate://crates.io/ciborium/0.2.0;name=ciborium-0.2.0 \
-crate://crates.io/ciborium-io/0.2.0;name=ciborium-io-0.2.0 \
-crate://crates.io/ciborium-ll/0.2.0;name=ciborium-ll-0.2.0 \
-crate://crates.io/clap/3.2.23;name=clap-3.2.23 \
-crate://crates.io/clap_lex/0.2.4;name=clap_lex-0.2.4 \
-crate://crates.io/criterion/0.4.0;name=criterion-0.4.0 \
-crate://crates.io/criterion-plot/0.5.0;name=criterion-plot-0.5.0 \
-crate://crates.io/crossbeam-channel/0.5.7;name=crossbeam-channel-0.5.7 \
-crate://crates.io/crossbeam-deque/0.8.3;name=crossbeam-deque-0.8.3 \
-crate://crates.io/crossbeam-epoch/0.9.14;name=crossbeam-epoch-0.9.14 \
-crate://crates.io/crossbeam-utils/0.8.15;name=crossbeam-utils-0.8.15 \
-crate://crates.io/either/1.8.1;name=either-1.8.1 \
-crate://crates.io/enumflags2/0.7.5;name=enumflags2-0.7.5 \
-crate://crates.io/enumflags2_derive/0.7.4;name=enumflags2_derive-0.7.4 \
-crate://crates.io/form_urlencoded/1.1.0;name=form_urlencoded-1.1.0 \
-crate://crates.io/futures-channel/0.3.27;name=futures-channel-0.3.27 \
-crate://crates.io/futures-core/0.3.27;name=futures-core-0.3.27 \
-crate://crates.io/futures-executor/0.3.27;name=futures-executor-0.3.27 \
-crate://crates.io/futures-macro/0.3.27;name=futures-macro-0.3.27 \
-crate://crates.io/futures-task/0.3.27;name=futures-task-0.3.27 \
-crate://crates.io/futures-util/0.3.27;name=futures-util-0.3.27 \
-crate://crates.io/getrandom/0.2.8;name=getrandom-0.2.8 \
-crate://crates.io/half/1.8.2;name=half-1.8.2 \
-crate://crates.io/hashbrown/0.12.3;name=hashbrown-0.12.3 \
-crate://crates.io/heck/0.3.3;name=heck-0.3.3 \
-crate://crates.io/hermit-abi/0.1.19;name=hermit-abi-0.1.19 \
-crate://crates.io/hermit-abi/0.2.6;name=hermit-abi-0.2.6 \
-crate://crates.io/idna/0.3.0;name=idna-0.3.0 \
-crate://crates.io/indexmap/1.9.2;name=indexmap-1.9.2 \
-crate://crates.io/itertools/0.9.0;name=itertools-0.9.0 \
-crate://crates.io/itertools/0.10.5;name=itertools-0.10.5 \
-crate://crates.io/itoa/1.0.6;name=itoa-1.0.6 \
-crate://crates.io/js-sys/0.3.61;name=js-sys-0.3.61 \
-crate://crates.io/lazy_static/1.4.0;name=lazy_static-1.4.0 \
-crate://crates.io/libc/0.2.140;name=libc-0.2.140 \
-crate://crates.io/log/0.4.17;name=log-0.4.17 \
-crate://crates.io/memchr/2.5.0;name=memchr-2.5.0 \
-crate://crates.io/memoffset/0.8.0;name=memoffset-0.8.0 \
-crate://crates.io/num-integer/0.1.45;name=num-integer-0.1.45 \
-crate://crates.io/num-traits/0.2.15;name=num-traits-0.2.15 \
-crate://crates.io/num_cpus/1.15.0;name=num_cpus-1.15.0 \
-crate://crates.io/once_cell/1.17.1;name=once_cell-1.17.1 \
-crate://crates.io/oorandom/11.1.3;name=oorandom-11.1.3 \
-crate://crates.io/os_str_bytes/6.5.0;name=os_str_bytes-6.5.0 \
-crate://crates.io/percent-encoding/2.2.0;name=percent-encoding-2.2.0 \
-crate://crates.io/pin-project-lite/0.2.9;name=pin-project-lite-0.2.9 \
-crate://crates.io/pin-utils/0.1.0;name=pin-utils-0.1.0 \
-crate://crates.io/pkg-c

[OE-Core][PATCH 6/6] rust: Upgrade 1.74.0 -> 1.74.1

2023-12-24 Thread Alex Kiernan

https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} | 0
 .../rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb}   | 0
 ...t-cross-canadian_1.74.0.bb => rust-cross-canadian_1.74.1.bb} | 0
 .../rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.74.0.bb => cargo_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.74.0.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.74.0.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.74.0.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.74.0.bb => rust_1.74.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.74.0.bb 
b/meta/recipes-devtools/rust/cargo_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.74.0.bb
rename to meta/recipes-devtools/rust/cargo_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.74.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.74.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.74.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.74.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.74.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index e8dafe59c9b0..83a0dbc15fae 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -11,7 +11,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"23705e38c1a37acfd7fbb921c5dd8772619476e80d0b3b39ac8eb45bc0c33187"
+SRC_URI[rust.sha256sum] = 
"b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.74.0.bb 
b/meta/recipes-devtools/rust/rust_1.74.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.74.0.bb
rename to meta/recipes-devtools/rust/rust_1.74.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192900): 
https://lists.openembedded.org/g/openembedded-core/message/192900
Mute This Topic: https://lists.openembedded.org/mt/103354263/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 4/6] rust: Upgrade 1.72.1 -> 1.73.0

2023-12-24 Thread Alex Kiernan

https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html

Signed-off-by: Alex Kiernan 
---

 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} |  0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 36 +-
 .../rust/files/hardcodepaths.patch|  8 ++-
 ...ibstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} |  0
 72.1.bb => rust-cross-canadian_1.73.0.bb} |  0
 ...ust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 68 ---
 meta/recipes-devtools/rust/rust-source.inc|  2 +-
 .../rust/{rust_1.72.1.bb => rust_1.73.0.bb}   |  0
 10 files changed, 55 insertions(+), 61 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.1.bb => 
rust-cross-canadian_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.1.bb => rust_1.73.0.bb} (100%)

diff --git a/meta/conf/distro/include/tcmode-default.inc 
b/meta/conf/distro/include/tcmode-default.inc
index f67b7be39c60..8960d9e0144e 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.5%"
 QEMUVERSION ?= "8.1%"
 GOVERSION ?= "1.20%"
 LLVMVERSION ?= "17.%"
-RUSTVERSION ?= "1.72%"
+RUSTVERSION ?= "1.73%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/rust/cargo_1.72.1.bb 
b/meta/recipes-devtools/rust/cargo_1.73.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.1.bb
rename to meta/recipes-devtools/rust/cargo_1.73.0.bb
diff --git 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
index dd23d09101ef..794ad804f0dc 100644
--- 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
+++ 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj 
  library/std/src/sys/unix/fs.rs | 27 ---
  3 files changed, 38 insertions(+), 12 deletions(-)
 
-Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs
-+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+--- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs
 rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 @@ -329,7 +329,14 @@ pub trait MetadataExt {
  impl MetadataExt for Metadata {
  #[allow(deprecated)]
@@ -39,10 +39,10 @@ Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
  }
  fn st_dev() -> u64 {
  self.as_inner().as_inner().st_dev as u64
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 @@ -124,9 +124,12 @@ impl FileDesc {
  }
  
@@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
  use libc::pwrite64;
  
  unsafe {
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
-@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
+@@ -39,9 +39,13 @@ use libc::{c_int, mode_t};
  all(target_os = "linux", target_env = "gnu")
  ))]
  use libc::c_char;
@@ -93,7 +93,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::fstatat64;
  #[cfg(any(
  target_os = "android",
-@@ -64,7 +68,7 @@ use libc::fstatat64;
+@@ -53,7 +57,7 @@ use libc::fstatat64;
  target_os = "vita",
  ))]
  use libc::readdir as readdir64;
@@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::readdir64;
  #[cfg(any(target_os = "emscripten", target_os = "l4re"))]
  use libc::readdir64_r;
-@@ -79,6 +83,7 @@ use libc::readdir64_r;
+@@ -68,6 +72,7 @@ use libc::readdir64_

[OE-Core][PATCH 3/6] rust: Upgrade 1.72.0 -> 1.72.1

2023-12-24 Thread Alex Kiernan

https://blog.rust-lang.org/2023/09/19/Rust-1.72.1.html

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} | 0
 .../rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb}   | 0
 ...t-cross-canadian_1.72.0.bb => rust-cross-canadian_1.72.1.bb} | 0
 .../rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.0.bb => 
rust-cross-canadian_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.72.0.bb 
b/meta/recipes-devtools/rust/cargo_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.0.bb
rename to meta/recipes-devtools/rust/cargo_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.72.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.72.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 253a8436d2a7..ca3fcf9e884d 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 
file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 
file://0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014"
+SRC_URI[rust.sha256sum] = 
"aea58d962ff1c19521b9f587aad88285f0fd35b6b6738b031a7a15bb1b70a7c3"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.72.0.bb 
b/meta/recipes-devtools/rust/rust_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.72.0.bb
rename to meta/recipes-devtools/rust/rust_1.72.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192897): 
https://lists.openembedded.org/g/openembedded-core/message/192897
Mute This Topic: https://lists.openembedded.org/mt/103354259/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 0/6] Stepwise rust upgrade 1.71.1 -> 1.74.1

2023-12-24 Thread Alex Kiernan

This is the 1.74.1 rust series rebased to include a revert of
https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec
which I'm pretty sure is what's causing our filename churn. I've checked
1.72.0 and 1.74.1 for the absvdi2.o intrinsic (one of many intrinsics
which had the issue) and in both cases we're not generating the dirname
based prefix - hopefully that means that the interim commits are fine
too, if not we can do the step back through the commits to find the next
issue.

I've dropped the zvariant tests as upgrading it isn't useful (since it
no longer includes git crate dependency) and spurious oe-selftest
failures aren't helpful. I guess we need to include either something
synthetic which tests git crates, or pull in
https://github.com/jthornber/thin-provisioning-tools/ from
meta-openembedded which includes a live example (though who knows for
how long!)

Assuming this does actually fix the reproducibility issue, I'll look at
how we fix the issue properly, rather than just reverting the commit
which I think is our problem, but I'd like to try and get us back on the
rust release train if we can!


Alex Kiernan (6):
  meta-selftest: Drop zvariant recipe
  rust: Upgrade 1.71.1 -> 1.72.0
  rust: Upgrade 1.72.0 -> 1.72.1
  rust: Upgrade 1.72.1 -> 1.73.0
  rust: Upgrade 1.73.0 -> 1.74.0
  rust: Upgrade 1.74.0 -> 1.74.1

 .../zvariant/zvariant-crates.inc  |  258 
 .../zvariant/zvariant-git-crates.inc  |   14 -
 .../0001-Tweak-zvariant-crate-config.patch| 1292 -
 .../zvariant/zvariant_3.12.0.bb   |   37 -
 meta/conf/distro/include/tcmode-default.inc   |2 +-
 meta/lib/oeqa/selftest/cases/devtool.py   |   93 --
 .../rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} |0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch |  164 ---
 ...0001-Don-t-use-LFS64-symbols-on-musl.patch |  163 +++
 ...e-absolute-paths-to-OUT_DIR-as-relat.patch |   67 +
 ...Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch |  122 ++
 ...efine-SOCK_SEQPACKET-in-common-place.patch |  114 --
 ...ine-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch |   41 +
 ...GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch |  205 +++
 ...-musl-Define-O_LARGEFILE-for-riscv32.patch |   32 +
 ...efine-SOCK_SEQPACKET-in-common-place.patch |  115 ++
 .../rust/files/getrandom-open64.patch |   50 -
 .../rust/files/hardcodepaths.patch|   14 +-
 .../rust/files/zlib-off64_t.patch |   17 +-
 ...ibstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} |0
 71.1.bb => rust-cross-canadian_1.74.1.bb} |0
 ...ust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} |0
 meta/recipes-devtools/rust/rust-snapshot.inc  |   64 +-
 meta/recipes-devtools/rust/rust-source.inc|   12 +-
 .../rust/{rust_1.71.1.bb => rust_1.74.1.bb}   |1 +
 25 files changed, 802 insertions(+), 2075 deletions(-)
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant-git-crates.inc
 delete mode 100644 
meta-selftest/recipes-extended/zvariant/zvariant/0001-Tweak-zvariant-crate-config.patch
 delete mode 100644 meta-selftest/recipes-extended/zvariant/zvariant_3.12.0.bb
 rename meta/recipes-devtools/rust/{cargo_1.71.1.bb => cargo_1.74.1.bb} (100%)
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Don-t-use-LFS64-symbols-on-musl.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-Revert-Map-source-absolute-paths-to-OUT_DIR-as-relat.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_NONBLOCK-with-O_NONBLOCK.patch
 delete mode 100644 
meta/recipes-devtools/rust/files/0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0002-musl-riscv32-Define-F_SETLK-F_SETLKW-and-fix-F_GETLK.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0003-musl-Move-F_OFD_GETLK-F_OFD_SETLK-and-F_OFD_SETLKW-t.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0004-musl-Define-O_LARGEFILE-for-riscv32.patch
 create mode 100644 
meta/recipes-devtools/rust/files/0005-musl-Define-SOCK_SEQPACKET-in-common-place.patch
 delete mode 100644 meta/recipes-devtools/rust/files/getrandom-open64.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.71.1.bb => libstd-rs_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.1.bb => 
rust-cross-canadian_1.74.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.71.1.bb => rust-llvm_1.74.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.71.1.bb => rust_1.74.1.bb} (99%)

-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192895): 
https://lists.openembedded.org/g/openembedded-core/message/192895
Mute This Topic: https://lists.openembedded.org/mt/1033

Re: [OE-Core][PATCH] rust: Upgrade 1.71.1 -> 1.74.1

2023-12-23 Thread Alex Kiernan

On Sat, Dec 23, 2023 at 7:32 PM Alex Kiernan via
lists.openembedded.org 
wrote:
>
> On Fri, Dec 15, 2023 at 5:24 PM Khem Raj  wrote:
> >
> > On Fri, Dec 15, 2023 at 4:41 AM Alex Kiernan  wrote:
> > >
> > > On Thu, Dec 14, 2023 at 10:28 AM Ross Burton  wrote:
> > > >
> > > > On 13 Dec 2023, at 14:06, Richard Purdie via lists.openembedded.org 
> > > >  wrote:
> > > > > I've run this with this patch included:
> > > > >
> > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4082
> > > >
> > > > Same failure:
> > > >
> > > > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20231213-s13b67oz/packages/diff-html/
> > > >
> > > > Ross
> > >
> > > Thanks both.
> > >
> > > It does look like its just filename churn, but I cannot find where
> > > those names actually get generated :| Suspect this will be a report
> > > upstream and hope someone helps.
> > >
> >
> > I think its the cmdline options passed to compiler-builtins crate. So
> > looking closely at this crates build log can reveal the problem. If
> > somewhere we have builds
> > done in two different folders I can take a look
> >
>
> I think you're right... I've been looking in completely the wrong place :|
>

I think this is our problem:

https://github.com/rust-lang/cc-rs/commit/c4f414f449bb7cffba3bc923f277704d1d08a8ec

> --
> Alex Kiernan
>
> 
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192888): 
https://lists.openembedded.org/g/openembedded-core/message/192888
Mute This Topic: https://lists.openembedded.org/mt/103146651/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH] rust: Upgrade 1.71.1 -> 1.74.1

2023-12-23 Thread Alex Kiernan

On Fri, Dec 15, 2023 at 5:24 PM Khem Raj  wrote:
>
> On Fri, Dec 15, 2023 at 4:41 AM Alex Kiernan  wrote:
> >
> > On Thu, Dec 14, 2023 at 10:28 AM Ross Burton  wrote:
> > >
> > > On 13 Dec 2023, at 14:06, Richard Purdie via lists.openembedded.org 
> > >  wrote:
> > > > I've run this with this patch included:
> > > >
> > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4082
> > >
> > > Same failure:
> > >
> > > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20231213-s13b67oz/packages/diff-html/
> > >
> > > Ross
> >
> > Thanks both.
> >
> > It does look like its just filename churn, but I cannot find where
> > those names actually get generated :| Suspect this will be a report
> > upstream and hope someone helps.
> >
>
> I think its the cmdline options passed to compiler-builtins crate. So
> looking closely at this crates build log can reveal the problem. If
> somewhere we have builds
> done in two different folders I can take a look
>

I think you're right... I've been looking in completely the wrong place :|

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192886): 
https://lists.openembedded.org/g/openembedded-core/message/192886
Mute This Topic: https://lists.openembedded.org/mt/103146651/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][RFC PATCH v2] sstate-cache-management: Rewrite in python

2023-12-23 Thread Alex Kiernan

This (should be) a drop in replacement for sstate-cache-management.sh.

Signed-off-by: Alex Kiernan 
---
This is hopefully an option compatible drop in for the existing shell
sstate-cache-management script. It's orders of magnitude faster, for
example removing duplicates, with a warmed cache across a more or less
vanilla poky build:

shell: 24.55s
python: 0.63s

Running on an NFS mount with 1000s of objects the improvement is even
more marked.

There are differences in the lists of things which are removed, but all
examples I've found are things where the shell failed to remove things
it could.

There's an additional option to remove orphan siginfo files, which I
found quite a lot of during testing.

The --extra-archs and --extra-layer options are unimplemented since, as
far as I could work out, they were really implementation artefacts of
the existing script - there's a couple of functions I implemented which
generate this data, but I really couldn't see anywhere I actually needed
it; these want deleting if this goes beyond RFC.

Similary the --follow-symlink option is unimplemented as that appears to
an sstate-cache implementation detail which is no longer used.

The couple of TODOs left are all about more parallelisation, I expect
neither of them is as big a win as parallelising the stat()ing of all
the paths was (especially when running over NFS).

Changes in v2:
- Actually send the right version with working unlink() :|

 scripts/sstate-cache-management.py | 329 +
 1 file changed, 329 insertions(+)
 create mode 100755 scripts/sstate-cache-management.py

diff --git a/scripts/sstate-cache-management.py 
b/scripts/sstate-cache-management.py
new file mode 100755
index ..09b7aa2aefd8
--- /dev/null
+++ b/scripts/sstate-cache-management.py
@@ -0,0 +1,329 @@
+#!/usr/bin/env python3
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+import argparse
+import os
+import re
+import sys
+
+from collections import defaultdict
+from concurrent.futures import ThreadPoolExecutor
+from dataclasses import dataclass
+from pathlib import Path
+
+if sys.version_info < (3, 8, 0):
+raise RuntimeError("Sorry, python 3.8.0 or later is required for this 
script.")
+
+SSTATE_PREFIX = "sstate:"
+SSTATE_EXTENSION = ".tar.zst"
+# SSTATE_EXTENSION = ".tgz"
+# .siginfo.done files are mentioned in the original script?
+SSTATE_SUFFIXES = (
+SSTATE_EXTENSION,
+f"{SSTATE_EXTENSION}.siginfo",
+f"{SSTATE_EXTENSION}.done",
+)
+
+RE_SSTATE_PKGSPEC = re.compile(
+rf"""sstate:(?P[^:]*):
+ (?P[^:]*):
+ (?P[^:]*):
+ (?P[^:]*):
+ (?P[^:]*):
+ (?P[^_]*):
+ (?P[^_]*)_
+ (?P[^:]*)
+ (?P({"|".join([re.escape(s) for s in SSTATE_SUFFIXES])}))$""",
+re.X,
+)
+
+
+# Really we'd like something like a Path subclass which implements a stat
+# cache here, unfortunately there's no good way to do that transparently
+# (yet); see:
+#
+# https://github.com/python/cpython/issues/70219
+# https://discuss.python.org/t/make-pathlib-extensible/3428/77
+@dataclass
+class SstateEntry:
+"""Class for keeping track of an entry in sstate-cache."""
+
+path: Path
+match: re.Match
+stat_result: os.stat_result = None
+
+def __hash__(self):
+return self.path.__hash__()
+
+def __getattr__(self, name):
+return self.match.group(name)
+
+
+# this is what's in the original script; as far as I can tell, it's an
+# implementation artefact which we don't need?
+def find_archs():
+# all_archs
+builder_arch = os.uname().machine
+
+# FIXME
+layer_paths = [Path("../..")]
+
+tune_archs = set()
+re_tune = re.compile(r'AVAILTUNES .*=.*"(.*)"')
+for path in layer_paths:
+for tunefile in [
+p for p in path.glob("meta*/conf/machine/include/**/*") if 
p.is_file()
+]:
+with open(tunefile) as f:
+for line in f:
+m = re_tune.match(line)
+if m:
+tune_archs.update(m.group(1).split())
+
+# all_machines
+machine_archs = set()
+for path in layer_paths:
+for machine_file in path.glob("meta*/conf/machine/*.conf"):
+machine_archs.add(machine_file.parts[-1][:-5])
+
+extra_archs = set()
+all_archs = (
+set(
+arch.replace("-", "_")
+for arch in machine_archs | tune_archs | set(["allarch", 
builder_arch])
+)
+| extra_archs
+)
+
+print(all_archs)
+
+
+# again, not needed?
+def find_tasks():
+print(set([p.bb_task for p in paths]))
+
+
+def collect_sstate_paths(args):
+def scandir(path, paths):
+# Assume everything is a directory; by n

[OE-Core][RFC PATCH] sstate-cache-management: Rewrite in python

2023-12-23 Thread Alex Kiernan

This (should be) a drop in replacement for sstate-cache-management.sh.
Signed-off-by: Alex Kiernan 
---
This is hopefully an option compatible drop in for the existing shell
sstate-cache-management script. It's orders of magnitude faster, for
example removing duplicates, with a warmed cache across a more or less
vanilla poky build:

shell: 24.55s
python: 0.63s

Running on an NFS mount with 1000s of objects the improvement is even
more marked.

There are differences in the lists of things which are removed, but all
examples I've found are things where the shell failed to remove things
it could.

There's an additional option to remove orphan siginfo files, which I
found quite a lot of during testing.

The --extra-archs and --extra-layer options are unimplemented since, as
far as I could work out, they were really implementation artefacts of
the existing script - there's a couple of functions I implemented which
generate this data, but I really couldn't see anywhere I actually needed
it; these want deleting if this goes beyond RFC.

Similary the --follow-symlink option is unimplemented as that appears to
an sstate-cache implementation detail which is no longer used.

The couple of TODOs left are all about more parallelisation, I expect
neither of them is as big a win as parallelising the stat()ing of all
the paths was (especially when running over NFS).

 scripts/sstate-cache-management.py | 329 +
 1 file changed, 329 insertions(+)
 create mode 100755 scripts/sstate-cache-management.py

diff --git a/scripts/sstate-cache-management.py 
b/scripts/sstate-cache-management.py
new file mode 100755
index ..3ae3a7fa0515
--- /dev/null
+++ b/scripts/sstate-cache-management.py
@@ -0,0 +1,329 @@
+#!/usr/bin/env python3
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+import argparse
+import os
+import re
+import sys
+
+from collections import defaultdict
+from concurrent.futures import ThreadPoolExecutor
+from dataclasses import dataclass
+from pathlib import Path
+
+if sys.version_info < (3, 8, 0):
+raise RuntimeError("Sorry, python 3.8.0 or later is required for this 
script.")
+
+SSTATE_PREFIX = "sstate:"
+SSTATE_EXTENSION = ".tar.zst"
+# SSTATE_EXTENSION = ".tgz"
+# .siginfo.done files are mentioned in the original script?
+SSTATE_SUFFIXES = (
+SSTATE_EXTENSION,
+f"{SSTATE_EXTENSION}.siginfo",
+f"{SSTATE_EXTENSION}.done",
+)
+
+RE_SSTATE_PKGSPEC = re.compile(
+rf"""sstate:(?P[^:]*):
+ (?P[^:]*):
+ (?P[^:]*):
+ (?P[^:]*):
+ (?P[^:]*):
+ (?P[^_]*):
+ (?P[^_]*)_
+ (?P[^:]*)
+ (?P({"|".join([re.escape(s) for s in SSTATE_SUFFIXES])}))$""",
+re.X,
+)
+
+
+# Really we'd like something like a Path subclass which implements a stat
+# cache here, unfortunately there's no good way to do that transparently
+# (yet); see:
+#
+# https://github.com/python/cpython/issues/70219
+# https://discuss.python.org/t/make-pathlib-extensible/3428/77
+@dataclass
+class SstateEntry:
+"""Class for keeping track of an entry in sstate-cache."""
+
+path: Path
+match: re.Match
+stat_result: os.stat_result = None
+
+def __hash__(self):
+return self.path.__hash__()
+
+def __getattr__(self, name):
+return self.match.group(name)
+
+
+# this is what's in the original script; as far as I can tell, it's an
+# implementation artefact which we don't need?
+def find_archs():
+# all_archs
+builder_arch = os.uname().machine
+
+# FIXME
+layer_paths = [Path("../..")]
+
+tune_archs = set()
+re_tune = re.compile(r'AVAILTUNES .*=.*"(.*)"')
+for path in layer_paths:
+for tunefile in [
+p for p in path.glob("meta*/conf/machine/include/**/*") if 
p.is_file()
+]:
+with open(tunefile) as f:
+for line in f:
+m = re_tune.match(line)
+if m:
+tune_archs.update(m.group(1).split())
+
+# all_machines
+machine_archs = set()
+for path in layer_paths:
+for machine_file in path.glob("meta*/conf/machine/*.conf"):
+machine_archs.add(machine_file.parts[-1][:-5])
+
+extra_archs = set()
+all_archs = (
+set(
+arch.replace("-", "_")
+for arch in machine_archs | tune_archs | set(["allarch", 
builder_arch])
+)
+| extra_archs
+)
+
+print(all_archs)
+
+
+# again, not needed?
+def find_tasks():
+print(set([p.bb_task for p in paths]))
+
+
+def collect_sstate_paths(args):
+def scandir(path, paths):
+# Assume everything is a directory; by not checking we avoid needing an
+# additional stat which is potentially a synchronous round

Re: [OE-core] mdns on musl

2023-12-18 Thread Alex Kiernan

On Sat, Dec 16, 2023 at 9:42 PM Matt Wood  wrote:
>
> This is a fundamental issue with musl:
> https://wiki.musl-libc.org/future-ideas
>
> I thought there was a solution using the mdns package (mDNSResponder from 
> Apple), but I could be misinterpreting what I have read.
>

I think there is (mDNSMacOSX/dnsproxy.c) but its only part of the MacOSX build.

> I saw a go implementation of avahi2dns, but this is for an initramfs so 
> trying to keep things small.
>
> I'll keep looking around but if anyone else has any suggestions I'd 
> appreciate it.
>
> Thanks, Matt
>
> On 12/16/23 15:42, Tim Orling wrote:
> >
> > On Sat, Dec 16, 2023 at 12:16 PM Khem Raj  > <mailto:raj.k...@gmail.com>> wrote:
> >
> > is this issue specific to musl systems?
> > Maybe try to reproduce it with glibc on qemu or something?
> >
> >
> > You might also search for mdns issues/solutions in Alpine Linux which is 
> > always musl.
> >
> >
> > On Sat, Dec 16, 2023 at 9:11 AM  > <mailto:mattwood2...@gmail.com>> wrote:
> > >
> > > Hi all,
> > >
> > > I'm working on an embedded system and it needs mDNS in order to 
> > interact with .local hostnames.
> > >
> > > The image is based on musl so it cannot use the libnss-mdns library.
> > >
> > > From what I've read the mdns recipe is supposed to support mDNS on 
> > non-glibc systems.
> > >
> > > The recipe takes care of modifying /etc/nsswitch.conf and appends 
> > mdns to the hosts line.
> > >
> > > When the system boots it runs mdnsd and I can see it join the 
> > multicast group in wireshark, but I cannot ping any .local addresses.
> > >
> > > Is there some other configuration that needs to be done?
> > >
> > > Has anyone successfully done this with a musl system?
> > >
> > > Thanks, Matt.
> > >
> > >
> > >
> > >
> > >
> >
> >
> >
>
>
> 
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192641): 
https://lists.openembedded.org/g/openembedded-core/message/192641
Mute This Topic: https://lists.openembedded.org/mt/103211493/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH] rust: Upgrade 1.71.1 -> 1.74.1

2023-12-15 Thread Alex Kiernan

On Thu, Dec 14, 2023 at 10:28 AM Ross Burton  wrote:
>
> On 13 Dec 2023, at 14:06, Richard Purdie via lists.openembedded.org 
>  wrote:
> > I've run this with this patch included:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/4082
>
> Same failure:
>
> https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20231213-s13b67oz/packages/diff-html/
>
> Ross

Thanks both.

It does look like its just filename churn, but I cannot find where
those names actually get generated :| Suspect this will be a report
upstream and hope someone helps.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192430): 
https://lists.openembedded.org/g/openembedded-core/message/192430
Mute This Topic: https://lists.openembedded.org/mt/103146651/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 7/7] rust: Upgrade 1.73.0 -> 1.74.0

2023-12-12 Thread Alex Kiernan

On Tue, Dec 12, 2023 at 4:51 PM Alex Kiernan via
lists.openembedded.org 
wrote:
>
> On Tue, Dec 12, 2023 at 4:27 PM Randy MacLeod via
> lists.openembedded.org
>  wrote:
> >
> > On 2023-12-12 11:25 a.m., Randy MacLeod wrote:
> >
> > On 2023-12-12 5:41 a.m., Alex Kiernan via lists.openembedded.org wrote:
> >
> > On Sat, Dec 9, 2023 at 2:06 PM Alex Kiernan via lists.openembedded.org
> >  wrote:
> >
> > On Sat, Dec 9, 2023 at 12:18 PM Alexandre Belloni
> >  wrote:
> >
> > Hello Alex,
> >
> > rust 1.74.0 is not reproducible:
> > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20231208-rfbproj4/packages/diff-html/
> >
> > Thanks, I think :)
> >
> > One observation, which might be useful, these failures are all inside
> > the same module src/llvm-project/compiler-rt/lib/builtins which are
> > just a bunch of intrinsics. And as far as I can see it looks like it's
> > just the object name mangling that's not reproducible.
> >
> > FYI:
> >
> > In the weekly YP tech call, we talked about Rust and Richard said that he'd 
> > merge
> > 1.71 to master since it's progress and it unblocks some ptest works that 
> > Tim was working on.
> >
> > We can then just jump directly from 1.71 to 1.74 if ( when! ) we can make 
> > that reproducible.
> >
> > Or even  to rust-1.74.1:
> >
> >https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html
> >
>
> Yeah, I did 1.74.1 earlier today
> (https://github.com/akiernan/poky/commit/f408e74e37ac8cd6d0e4d9715317f69a039ad50f)
> - can post a patch for that if we want to give it a whirl? There's
> definitely some reproducibility fixes in there (e.g.
> https://github.com/rust-lang/rust/issues/112586) but I'm not convinced
> any of them are what we're seeing (which appear to really be in pieces
> of LLVM).
>

I just realised that because we now have two consecutive versions,
diffing the 1.71.1...1.72.0 trees was feasible... for the llvm-project
submodule, the changes are tiny (10 files, mostly RISCV specific or
tests, nothing that looks even slightly like the issue we're seeing).
So I suspect wherever the problem comes from its not actually inside
here.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192240): 
https://lists.openembedded.org/g/openembedded-core/message/192240
Mute This Topic: https://lists.openembedded.org/mt/103055169/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 7/7] rust: Upgrade 1.73.0 -> 1.74.0

2023-12-12 Thread Alex Kiernan

On Tue, Dec 12, 2023 at 4:27 PM Randy MacLeod via
lists.openembedded.org
 wrote:
>
> On 2023-12-12 11:25 a.m., Randy MacLeod wrote:
>
> On 2023-12-12 5:41 a.m., Alex Kiernan via lists.openembedded.org wrote:
>
> On Sat, Dec 9, 2023 at 2:06 PM Alex Kiernan via lists.openembedded.org
>  wrote:
>
> On Sat, Dec 9, 2023 at 12:18 PM Alexandre Belloni
>  wrote:
>
> Hello Alex,
>
> rust 1.74.0 is not reproducible:
> https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20231208-rfbproj4/packages/diff-html/
>
> Thanks, I think :)
>
> One observation, which might be useful, these failures are all inside
> the same module src/llvm-project/compiler-rt/lib/builtins which are
> just a bunch of intrinsics. And as far as I can see it looks like it's
> just the object name mangling that's not reproducible.
>
> FYI:
>
> In the weekly YP tech call, we talked about Rust and Richard said that he'd 
> merge
> 1.71 to master since it's progress and it unblocks some ptest works that Tim 
> was working on.
>
> We can then just jump directly from 1.71 to 1.74 if ( when! ) we can make 
> that reproducible.
>
> Or even  to rust-1.74.1:
>
>https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html
>

Yeah, I did 1.74.1 earlier today
(https://github.com/akiernan/poky/commit/f408e74e37ac8cd6d0e4d9715317f69a039ad50f)
- can post a patch for that if we want to give it a whirl? There's
definitely some reproducibility fixes in there (e.g.
https://github.com/rust-lang/rust/issues/112586) but I'm not convinced
any of them are what we're seeing (which appear to really be in pieces
of LLVM).

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192237): 
https://lists.openembedded.org/g/openembedded-core/message/192237
Mute This Topic: https://lists.openembedded.org/mt/103055169/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 7/7] rust: Upgrade 1.73.0 -> 1.74.0

2023-12-12 Thread Alex Kiernan

On Sat, Dec 9, 2023 at 2:06 PM Alex Kiernan via lists.openembedded.org
 wrote:
>
> On Sat, Dec 9, 2023 at 12:18 PM Alexandre Belloni
>  wrote:
> >
> > Hello Alex,
> >
> > rust 1.74.0 is not reproducible:
> > https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20231208-rfbproj4/packages/diff-html/
> >
>
> Thanks, I think :)
>

One observation, which might be useful, these failures are all inside
the same module src/llvm-project/compiler-rt/lib/builtins which are
just a bunch of intrinsics. And as far as I can see it looks like it's
just the object name mangling that's not reproducible.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192191): 
https://lists.openembedded.org/g/openembedded-core/message/192191
Mute This Topic: https://lists.openembedded.org/mt/103055169/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 3/7] rust: Upgrade 1.71.0 -> 1.71.1

2023-12-11 Thread Alex Kiernan

On Sun, Dec 10, 2023 at 7:39 PM Richard Purdie
 wrote:
>
> On Fri, 2023-12-08 at 14:03 +, Alex Kiernan wrote:
> > https://blog.rust-lang.org/2023/08/03/Rust-1.71.1.html
> >
> > Signed-off-by: Alex Kiernan 
> > ---
> >
> >  meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} | 0
> >  .../rust/{libstd-rs_1.71.0.bb => libstd-rs_1.71.1.bb}   | 0
> >  ...t-cross-canadian_1.71.0.bb => rust-cross-canadian_1.71.1.bb} | 0
> >  .../rust/{rust-llvm_1.71.0.bb => rust-llvm_1.71.1.bb}   | 0
> >  meta/recipes-devtools/rust/rust-source.inc  | 2 +-
> >  meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb}   | 0
> >  6 files changed, 1 insertion(+), 1 deletion(-)
> >  rename meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} 
> > (100%)
> >  rename meta/recipes-devtools/rust/{libstd-rs_1.71.0.bb => 
> > libstd-rs_1.71.1.bb} (100%)
> >  rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.0.bb => 
> > rust-cross-canadian_1.71.1.bb} (100%)
> >  rename meta/recipes-devtools/rust/{rust-llvm_1.71.0.bb => 
> > rust-llvm_1.71.1.bb} (100%)
> >  rename meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb} (100%)
> >
> > diff --git a/meta/recipes-devtools/rust/cargo_1.71.0.bb 
> > b/meta/recipes-devtools/rust/cargo_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/cargo_1.71.0.bb
> > rename to meta/recipes-devtools/rust/cargo_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/libstd-rs_1.71.0.bb 
> > b/meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/libstd-rs_1.71.0.bb
> > rename to meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb 
> > b/meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb
> > rename to meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/rust-llvm_1.71.0.bb 
> > b/meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/rust-llvm_1.71.0.bb
> > rename to meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/rust-source.inc 
> > b/meta/recipes-devtools/rust/rust-source.inc
> > index 3a192e42db7d..0729db6f0b45 100644
> > --- a/meta/recipes-devtools/rust/rust-source.inc
> > +++ b/meta/recipes-devtools/rust/rust-source.inc
> > @@ -7,7 +7,7 @@ SRC_URI += 
> > "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
> >  file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
> >  
> > file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
> >  \
> >  "
> > -SRC_URI[rust.sha256sum] = 
> > "5814699031aafdcc2e2f71fc9b389678cd7042350d1583da061463d8e88681c7"
> > +SRC_URI[rust.sha256sum] = 
> > "371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1"
> >
> >  RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
> >
> > diff --git a/meta/recipes-devtools/rust/rust_1.71.0.bb 
> > b/meta/recipes-devtools/rust/rust_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/rust_1.71.0.bb
> > rename to meta/recipes-devtools/rust/rust_1.71.1.bb
>
> I ran some testing and it looks like we could merge up to 1.71.1
> without autobuilder failures in this series. Beyond that we have the
> reproducibility and zvariant issues.
>

https://github.com/rust-lang/cargo/issues/8140 looks possibly
relevant. I wonder if we're just getting lucky somehow.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192180): 
https://lists.openembedded.org/g/openembedded-core/message/192180
Mute This Topic: https://lists.openembedded.org/mt/103055164/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 1/2] cargo-update-recipe-crates: Use CARGO_LOCK_PATH

2023-12-11 Thread Alex Kiernan

On Mon, Dec 11, 2023 at 10:52 AM Alex Kiernan via
lists.openembedded.org 
wrote:
>
> On Mon, Dec 11, 2023 at 9:43 AM Alex Kiernan  wrote:
> >
> > On Mon, Dec 11, 2023 at 9:28 AM Alexander Kanavin
> >  wrote:
> > >
> > > On Mon, 11 Dec 2023 at 10:09, Alex Kiernan  wrote:
> > > > In a single project there are (potentially) multiple Cargo.toml, but
> > > > just one Cargo.lock. If there's multiple Cargo.lock files in a repo,
> > > > that implies multiple projects which I don't think we've any way of
> > > > building from a single recipe.
> > >
> > > I'm thinking of projects like librsvg, python3-bcrypt or
> > > python3-cryptography where the build is orchestrated by meson,
> > > autoconf or setuptools, and where we don't run cargo directly and
> > > leave it to those tools. They may have single Cargo.lock now, but will
> > > that hold? Also, that Cargo.lock is not necessarily in the root of
> > > ${S}, so you'd have to set the location manually, instead of not
> > > having to worry about it. Is CARGO_LOCK_PATH or its parent variables
> > > already set correctly for all of them? I see this is not done from
> > > python3-cryptography; shouldn't the build error out, if
> > > cargo_common_do_patch_paths requires the location? Something doesn't
> > > compute fully here.
> > >
> >
> > That's exactly the one I was going to look at next, as I agree
> > something doesn't add up there.
> >
>
> cargo_common_do_patch_paths isn't in the call graph for
> python3-cryptography, it gets patched in like this:
>
> do_configure[postfuncs] += "cargo_common_do_patch_paths"
>
> I'm unclear why that doesn't execute, I'm wondering if its related to
> the autogenerated do_configure and this is a usage that just doesn't
> work?
>
> # line: 1, file: autogenerated
> do_configure() {
> setup_target_config
> python_setuptools3_rust_do_configure
> }
>
> However even if it was in the call graph, we wouldn't have errored in
> it as there's no patches to apply to the cargo config as the crates
> are all satisfied from the vendored sources we deliver.
>
> It does feel like we're missing a piece in our python/rust integration
> since if you did have a crate delivered from git then we wouldn't
> patch up the cargo config correctly and I guess end up erroring out.
>

Okay, I'm wrong. The pieces are all there, just we have no git crates
to patch in for python3-cryptography so the existence check for
Cargo.lock never runs. Maybe that should be hoisted earlier in the
function so you see the failure if Cargo.lock isn't where it would be
expected to be.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192179): 
https://lists.openembedded.org/g/openembedded-core/message/192179
Mute This Topic: https://lists.openembedded.org/mt/103094777/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 3/7] rust: Upgrade 1.71.0 -> 1.71.1

2023-12-11 Thread Alex Kiernan

On Mon, Dec 11, 2023 at 10:01 AM Frédéric Martinsons
 wrote:
>
>
>
> On Mon, 11 Dec 2023 at 10:17, Alex Kiernan  wrote:
>>
>> On Mon, Dec 11, 2023 at 7:15 AM Frédéric Martinsons
>>  wrote:
>> >
>> >
>> >
>> > On Sun, 10 Dec 2023 at 21:28, Alex Kiernan  wrote:
>> >>
>> >> On Sun, Dec 10, 2023 at 7:39 PM Richard Purdie
>> >>  wrote:
>> >> >
>> >> > On Fri, 2023-12-08 at 14:03 +, Alex Kiernan wrote:
>> >> > > https://blog.rust-lang.org/2023/08/03/Rust-1.71.1.html
>> >> > >
>> >> > > Signed-off-by: Alex Kiernan 
>> >> > > ---
>> >> > >
>> >> > >  meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} | 0
>> >> > >  .../rust/{libstd-rs_1.71.0.bb => libstd-rs_1.71.1.bb}   | 0
>> >> > >  ...t-cross-canadian_1.71.0.bb => rust-cross-canadian_1.71.1.bb} | 0
>> >> > >  .../rust/{rust-llvm_1.71.0.bb => rust-llvm_1.71.1.bb}   | 0
>> >> > >  meta/recipes-devtools/rust/rust-source.inc  | 2 
>> >> > > +-
>> >> > >  meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb}   | 0
>> >> > >  6 files changed, 1 insertion(+), 1 deletion(-)
>> >> > >  rename meta/recipes-devtools/rust/{cargo_1.71.0.bb => 
>> >> > > cargo_1.71.1.bb} (100%)
>> >> > >  rename meta/recipes-devtools/rust/{libstd-rs_1.71.0.bb => 
>> >> > > libstd-rs_1.71.1.bb} (100%)
>> >> > >  rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.0.bb => 
>> >> > > rust-cross-canadian_1.71.1.bb} (100%)
>> >> > >  rename meta/recipes-devtools/rust/{rust-llvm_1.71.0.bb => 
>> >> > > rust-llvm_1.71.1.bb} (100%)
>> >> > >  rename meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb} 
>> >> > > (100%)
>> >> > >
>> >> > > diff --git a/meta/recipes-devtools/rust/cargo_1.71.0.bb 
>> >> > > b/meta/recipes-devtools/rust/cargo_1.71.1.bb
>> >> > > similarity index 100%
>> >> > > rename from meta/recipes-devtools/rust/cargo_1.71.0.bb
>> >> > > rename to meta/recipes-devtools/rust/cargo_1.71.1.bb
>> >> > > diff --git a/meta/recipes-devtools/rust/libstd-rs_1.71.0.bb 
>> >> > > b/meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
>> >> > > similarity index 100%
>> >> > > rename from meta/recipes-devtools/rust/libstd-rs_1.71.0.bb
>> >> > > rename to meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
>> >> > > diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb 
>> >> > > b/meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
>> >> > > similarity index 100%
>> >> > > rename from meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb
>> >> > > rename to meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
>> >> > > diff --git a/meta/recipes-devtools/rust/rust-llvm_1.71.0.bb 
>> >> > > b/meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
>> >> > > similarity index 100%
>> >> > > rename from meta/recipes-devtools/rust/rust-llvm_1.71.0.bb
>> >> > > rename to meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
>> >> > > diff --git a/meta/recipes-devtools/rust/rust-source.inc 
>> >> > > b/meta/recipes-devtools/rust/rust-source.inc
>> >> > > index 3a192e42db7d..0729db6f0b45 100644
>> >> > > --- a/meta/recipes-devtools/rust/rust-source.inc
>> >> > > +++ b/meta/recipes-devtools/rust/rust-source.inc
>> >> > > @@ -7,7 +7,7 @@ SRC_URI += 
>> >> > > "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
>> >> > >  file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
>> >> > >  
>> >> > > file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
>> >> > >  \
>> >> > >  "
>> >> > > -SRC_URI[rust.sha256sum] = 
>> >> > > "5814699031aafdcc2e2f71fc9b389678cd7042350d1583da061463d8e88681c7"
>> >> > > +SRC_URI[rust.sha256sum] = 
>> >> > > "371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1"
>> >> &

Re: [OE-Core][PATCH 1/2] cargo-update-recipe-crates: Use CARGO_LOCK_PATH

2023-12-11 Thread Alex Kiernan

On Mon, Dec 11, 2023 at 9:43 AM Alex Kiernan  wrote:
>
> On Mon, Dec 11, 2023 at 9:28 AM Alexander Kanavin
>  wrote:
> >
> > On Mon, 11 Dec 2023 at 10:09, Alex Kiernan  wrote:
> > > In a single project there are (potentially) multiple Cargo.toml, but
> > > just one Cargo.lock. If there's multiple Cargo.lock files in a repo,
> > > that implies multiple projects which I don't think we've any way of
> > > building from a single recipe.
> >
> > I'm thinking of projects like librsvg, python3-bcrypt or
> > python3-cryptography where the build is orchestrated by meson,
> > autoconf or setuptools, and where we don't run cargo directly and
> > leave it to those tools. They may have single Cargo.lock now, but will
> > that hold? Also, that Cargo.lock is not necessarily in the root of
> > ${S}, so you'd have to set the location manually, instead of not
> > having to worry about it. Is CARGO_LOCK_PATH or its parent variables
> > already set correctly for all of them? I see this is not done from
> > python3-cryptography; shouldn't the build error out, if
> > cargo_common_do_patch_paths requires the location? Something doesn't
> > compute fully here.
> >
>
> That's exactly the one I was going to look at next, as I agree
> something doesn't add up there.
>

cargo_common_do_patch_paths isn't in the call graph for
python3-cryptography, it gets patched in like this:

do_configure[postfuncs] += "cargo_common_do_patch_paths"

I'm unclear why that doesn't execute, I'm wondering if its related to
the autogenerated do_configure and this is a usage that just doesn't
work?

# line: 1, file: autogenerated
do_configure() {
setup_target_config
python_setuptools3_rust_do_configure
}

However even if it was in the call graph, we wouldn't have errored in
it as there's no patches to apply to the cargo config as the crates
are all satisfied from the vendored sources we deliver.

It does feel like we're missing a piece in our python/rust integration
since if you did have a crate delivered from git then we wouldn't
patch up the cargo config correctly and I guess end up erroring out.


--
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192161): 
https://lists.openembedded.org/g/openembedded-core/message/192161
Mute This Topic: https://lists.openembedded.org/mt/103094777/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 1/2] cargo-update-recipe-crates: Use CARGO_LOCK_PATH

2023-12-11 Thread Alex Kiernan

On Mon, Dec 11, 2023 at 9:28 AM Alexander Kanavin
 wrote:
>
> On Mon, 11 Dec 2023 at 10:09, Alex Kiernan  wrote:
> > In a single project there are (potentially) multiple Cargo.toml, but
> > just one Cargo.lock. If there's multiple Cargo.lock files in a repo,
> > that implies multiple projects which I don't think we've any way of
> > building from a single recipe.
>
> I'm thinking of projects like librsvg, python3-bcrypt or
> python3-cryptography where the build is orchestrated by meson,
> autoconf or setuptools, and where we don't run cargo directly and
> leave it to those tools. They may have single Cargo.lock now, but will
> that hold? Also, that Cargo.lock is not necessarily in the root of
> ${S}, so you'd have to set the location manually, instead of not
> having to worry about it. Is CARGO_LOCK_PATH or its parent variables
> already set correctly for all of them? I see this is not done from
> python3-cryptography; shouldn't the build error out, if
> cargo_common_do_patch_paths requires the location? Something doesn't
> compute fully here.
>

That's exactly the one I was going to look at next, as I agree
something doesn't add up there.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192152): 
https://lists.openembedded.org/g/openembedded-core/message/192152
Mute This Topic: https://lists.openembedded.org/mt/103094777/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 3/7] rust: Upgrade 1.71.0 -> 1.71.1

2023-12-11 Thread Alex Kiernan

On Mon, Dec 11, 2023 at 7:15 AM Frédéric Martinsons
 wrote:
>
>
>
> On Sun, 10 Dec 2023 at 21:28, Alex Kiernan  wrote:
>>
>> On Sun, Dec 10, 2023 at 7:39 PM Richard Purdie
>>  wrote:
>> >
>> > On Fri, 2023-12-08 at 14:03 +, Alex Kiernan wrote:
>> > > https://blog.rust-lang.org/2023/08/03/Rust-1.71.1.html
>> > >
>> > > Signed-off-by: Alex Kiernan 
>> > > ---
>> > >
>> > >  meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} | 0
>> > >  .../rust/{libstd-rs_1.71.0.bb => libstd-rs_1.71.1.bb}   | 0
>> > >  ...t-cross-canadian_1.71.0.bb => rust-cross-canadian_1.71.1.bb} | 0
>> > >  .../rust/{rust-llvm_1.71.0.bb => rust-llvm_1.71.1.bb}   | 0
>> > >  meta/recipes-devtools/rust/rust-source.inc  | 2 +-
>> > >  meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb}   | 0
>> > >  6 files changed, 1 insertion(+), 1 deletion(-)
>> > >  rename meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} 
>> > > (100%)
>> > >  rename meta/recipes-devtools/rust/{libstd-rs_1.71.0.bb => 
>> > > libstd-rs_1.71.1.bb} (100%)
>> > >  rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.0.bb => 
>> > > rust-cross-canadian_1.71.1.bb} (100%)
>> > >  rename meta/recipes-devtools/rust/{rust-llvm_1.71.0.bb => 
>> > > rust-llvm_1.71.1.bb} (100%)
>> > >  rename meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb} 
>> > > (100%)
>> > >
>> > > diff --git a/meta/recipes-devtools/rust/cargo_1.71.0.bb 
>> > > b/meta/recipes-devtools/rust/cargo_1.71.1.bb
>> > > similarity index 100%
>> > > rename from meta/recipes-devtools/rust/cargo_1.71.0.bb
>> > > rename to meta/recipes-devtools/rust/cargo_1.71.1.bb
>> > > diff --git a/meta/recipes-devtools/rust/libstd-rs_1.71.0.bb 
>> > > b/meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
>> > > similarity index 100%
>> > > rename from meta/recipes-devtools/rust/libstd-rs_1.71.0.bb
>> > > rename to meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
>> > > diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb 
>> > > b/meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
>> > > similarity index 100%
>> > > rename from meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb
>> > > rename to meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
>> > > diff --git a/meta/recipes-devtools/rust/rust-llvm_1.71.0.bb 
>> > > b/meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
>> > > similarity index 100%
>> > > rename from meta/recipes-devtools/rust/rust-llvm_1.71.0.bb
>> > > rename to meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
>> > > diff --git a/meta/recipes-devtools/rust/rust-source.inc 
>> > > b/meta/recipes-devtools/rust/rust-source.inc
>> > > index 3a192e42db7d..0729db6f0b45 100644
>> > > --- a/meta/recipes-devtools/rust/rust-source.inc
>> > > +++ b/meta/recipes-devtools/rust/rust-source.inc
>> > > @@ -7,7 +7,7 @@ SRC_URI += 
>> > > "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
>> > >  file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
>> > >  
>> > > file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
>> > >  \
>> > >  "
>> > > -SRC_URI[rust.sha256sum] = 
>> > > "5814699031aafdcc2e2f71fc9b389678cd7042350d1583da061463d8e88681c7"
>> > > +SRC_URI[rust.sha256sum] = 
>> > > "371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1"
>> > >
>> > >  RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
>> > >
>> > > diff --git a/meta/recipes-devtools/rust/rust_1.71.0.bb 
>> > > b/meta/recipes-devtools/rust/rust_1.71.1.bb
>> > > similarity index 100%
>> > > rename from meta/recipes-devtools/rust/rust_1.71.0.bb
>> > > rename to meta/recipes-devtools/rust/rust_1.71.1.bb
>> >
>> > I ran some testing and it looks like we could merge up to 1.71.1
>> > without autobuilder failures in this series. Beyond that we have the
>> > reproducibility and zvariant issues.
>> >
>>
>> Thanks.
>>
>> Was the failure at that point reproducibility or the zvariant trait
>>

Re: [OE-Core][PATCH 1/2] cargo-update-recipe-crates: Use CARGO_LOCK_PATH

2023-12-11 Thread Alex Kiernan

On Sun, Dec 10, 2023 at 8:35 PM Alexander Kanavin
 wrote:
>
>  I have to say, I struggle to see this as an improvement, and I want
> to object to it.
>

I have to admit I kinda thought this might be controversial.

> Why set the path manually, if the code to find where Cargo.lock is
> just works, and handles the situations where upstreams move it around
> in source trees?
>

We have to know where Cargo.lock is else cargo_common_do_patch_paths
fails. Searching for it one class and requiring to know where it is
another seems odd to me - my first pass on this change was to just set
CARGO_LOCK_SRC_DIR based on the directory name of CARGO_LOCK_PATH;
I'll resurrect that patch.

> Also, is the assumption that there's only one Cargo.lock valid? I'm
> not so sure. Note that the code was specifically written to pull in
> items from multiple files.
>

In a single project there are (potentially) multiple Cargo.toml, but
just one Cargo.lock. If there's multiple Cargo.lock files in a repo,
that implies multiple projects which I don't think we've any way of
building from a single recipe.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192148): 
https://lists.openembedded.org/g/openembedded-core/message/192148
Mute This Topic: https://lists.openembedded.org/mt/103094777/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 3/7] rust: Upgrade 1.71.0 -> 1.71.1

2023-12-10 Thread Alex Kiernan

On Sun, Dec 10, 2023 at 7:39 PM Richard Purdie
 wrote:
>
> On Fri, 2023-12-08 at 14:03 +, Alex Kiernan wrote:
> > https://blog.rust-lang.org/2023/08/03/Rust-1.71.1.html
> >
> > Signed-off-by: Alex Kiernan 
> > ---
> >
> >  meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} | 0
> >  .../rust/{libstd-rs_1.71.0.bb => libstd-rs_1.71.1.bb}   | 0
> >  ...t-cross-canadian_1.71.0.bb => rust-cross-canadian_1.71.1.bb} | 0
> >  .../rust/{rust-llvm_1.71.0.bb => rust-llvm_1.71.1.bb}   | 0
> >  meta/recipes-devtools/rust/rust-source.inc  | 2 +-
> >  meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb}   | 0
> >  6 files changed, 1 insertion(+), 1 deletion(-)
> >  rename meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} 
> > (100%)
> >  rename meta/recipes-devtools/rust/{libstd-rs_1.71.0.bb => 
> > libstd-rs_1.71.1.bb} (100%)
> >  rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.0.bb => 
> > rust-cross-canadian_1.71.1.bb} (100%)
> >  rename meta/recipes-devtools/rust/{rust-llvm_1.71.0.bb => 
> > rust-llvm_1.71.1.bb} (100%)
> >  rename meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb} (100%)
> >
> > diff --git a/meta/recipes-devtools/rust/cargo_1.71.0.bb 
> > b/meta/recipes-devtools/rust/cargo_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/cargo_1.71.0.bb
> > rename to meta/recipes-devtools/rust/cargo_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/libstd-rs_1.71.0.bb 
> > b/meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/libstd-rs_1.71.0.bb
> > rename to meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb 
> > b/meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb
> > rename to meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/rust-llvm_1.71.0.bb 
> > b/meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/rust-llvm_1.71.0.bb
> > rename to meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
> > diff --git a/meta/recipes-devtools/rust/rust-source.inc 
> > b/meta/recipes-devtools/rust/rust-source.inc
> > index 3a192e42db7d..0729db6f0b45 100644
> > --- a/meta/recipes-devtools/rust/rust-source.inc
> > +++ b/meta/recipes-devtools/rust/rust-source.inc
> > @@ -7,7 +7,7 @@ SRC_URI += 
> > "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
> >  file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
> >  
> > file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
> >  \
> >  "
> > -SRC_URI[rust.sha256sum] = 
> > "5814699031aafdcc2e2f71fc9b389678cd7042350d1583da061463d8e88681c7"
> > +SRC_URI[rust.sha256sum] = 
> > "371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1"
> >
> >  RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
> >
> > diff --git a/meta/recipes-devtools/rust/rust_1.71.0.bb 
> > b/meta/recipes-devtools/rust/rust_1.71.1.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/rust/rust_1.71.0.bb
> > rename to meta/recipes-devtools/rust/rust_1.71.1.bb
>
> I ran some testing and it looks like we could merge up to 1.71.1
> without autobuilder failures in this series. Beyond that we have the
> reproducibility and zvariant issues.
>

Thanks.

Was the failure at that point reproducibility or the zvariant trait
failure? I just posted an update for zvariant which doesn't see the
trait recursion failure, but at the same time it no longer exercises
crates pulled from git which looked like it was the main purpose it
was fulfilling for testing.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192125): 
https://lists.openembedded.org/g/openembedded-core/message/192125
Mute This Topic: https://lists.openembedded.org/mt/103055164/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 1/2] cargo-update-recipe-crates: Use CARGO_LOCK_PATH

2023-12-10 Thread Alex Kiernan

Rather than searching for Cargo.lock, just use CARGO_LOCK_PATH, since we
have to know where the lock file is, else cargo_common_do_patch_paths
will fail. There should only ever be one lock file associated with a
project, so trying to aggregate across all of them makes no sense.

Signed-off-by: Alex Kiernan 
---

 .../cargo-update-recipe-crates.bbclass| 30 +--
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/meta/classes-recipe/cargo-update-recipe-crates.bbclass 
b/meta/classes-recipe/cargo-update-recipe-crates.bbclass
index 8980137d02cf..59415ee8cb45 100644
--- a/meta/classes-recipe/cargo-update-recipe-crates.bbclass
+++ b/meta/classes-recipe/cargo-update-recipe-crates.bbclass
@@ -4,6 +4,8 @@
 # SPDX-License-Identifier: MIT
 #
 
+inherit cargo_common
+
 ##
 ## Purpose:
 ## This class is used to update the list of crates in SRC_URI
@@ -18,9 +20,6 @@ do_update_crates[depends] = 
"python3-native:do_populate_sysroot"
 do_update_crates[nostamp] = "1"
 do_update_crates[doc] = "Update the recipe by reading Cargo.lock and write in 
${THISDIR}/${BPN}-crates.inc"
 
-# The directory where to search for Cargo.lock files
-CARGO_LOCK_SRC_DIR ??= "${S}"
-
 do_update_crates() {
 TARGET_FILE="${THISDIR}/${BPN}-crates.inc"
 
@@ -28,8 +27,7 @@ do_update_crates() {
 
 def get_crates(f):
 import tomllib
-c_list = '# from %s' % os.path.relpath(f, '${CARGO_LOCK_SRC_DIR}')
-c_list += '\nSRC_URI += " \\\'
+c_list = 'SRC_URI += " \\\'
 crates = tomllib.load(open(f, 'rb'))
 
 # Build a list with crates info that have crates.io in the source
@@ -55,23 +53,11 @@ def get_crates(f):
 import os
 crates = "# Autogenerated with 'bitbake -c update_crates ${PN}'\n\n"
 found = False
-for root, dirs, files in os.walk('${CARGO_LOCK_SRC_DIR}'):
-# ignore git and patches directories
-if root.startswith(os.path.join('${CARGO_LOCK_SRC_DIR}', '.pc')):
-continue
-if root.startswith(os.path.join('${CARGO_LOCK_SRC_DIR}', '.git')):
-continue
-for file in files:
-if file == 'Cargo.lock':
-try:
-cargo_lock_path = os.path.join(root, file)
-crates += get_crates(os.path.join(root, file))
-except Exception as e:
-raise ValueError("Cannot parse '%s'" % cargo_lock_path) from e
-else:
-found = True
-if not found:
-raise ValueError("Unable to find any Cargo.lock in ${CARGO_LOCK_SRC_DIR}")
+try:
+cargo_lock_path = '${CARGO_LOCK_PATH}'
+crates += get_crates(cargo_lock_path)
+except Exception as e:
+raise ValueError("Cannot parse '%s'" % cargo_lock_path) from e
 open("${TARGET_FILE}", 'w').write(crates)
 EOF
 
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192116): 
https://lists.openembedded.org/g/openembedded-core/message/192116
Mute This Topic: https://lists.openembedded.org/mt/103094777/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 1/2] rust: Upgrade 1.70.0 -> 1.73.0

2023-12-08 Thread Alex Kiernan

On Fri, Dec 8, 2023 at 1:55 PM Richard Purdie
 wrote:
>
> On Fri, 2023-12-08 at 13:47 +, Alex Kiernan wrote:
> > On Fri, Dec 8, 2023 at 9:56 AM Shinde, Yash via lists.openembedded.org
> >  wrote:
> > >
> > > From: Yash Shinde 
> > >
> > > In rust 1.72.0 the 'mips*-unknown-linux-gnu*' support demoted from tier2 
> > > to tier3.
> > > The mips bootstrap compiler is removed from src/stage0.json file and
> > > so the same are removed from rust-snapshot.inc. 
> > > [https://github.com/rust-lang/rust/releases/tag/1.72.0]
> > >
> > > Drop bootstrap_fail.patch, getrandom-open64.patch
> > > as they are merged in upstream rust.
> > ]>
> > > Signed-off-by: Yash Shinde 
> > > ---
> >
> > If we're going to go down the road of disabling the rust oe-selftest
> > (and I don't see a better option right now as we're well behind), I
> > have a series which steps us through each of the releases up to
> > 1.74.0.
> >
> > It also avoids the need for the library/test hack (upstream has a new
> > target we can use for libstd).
>
> This sounds useful, particularly this last piece. Can you send it? We
> could probably combine it with 2/2 in this series if Yash/Randy agree.
>

I've pulled that in as the first patch in the series so if you were
bisecting you wouldn't see the oe-selftest fail on upgrade to 1.71.
It's on top of the cargo cleanups I posted yesterday, so I suspect
those are prerequisites (or I could combine the two into one series?)

I've not tested every step extensively, but they all build and I've
tested cargo in most of them manually inside qemu.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192071): 
https://lists.openembedded.org/g/openembedded-core/message/192071
Mute This Topic: https://lists.openembedded.org/mt/103052790/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 6/7] rust: Upgrade 1.72.1 -> 1.73.0

2023-12-08 Thread Alex Kiernan

https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html

Signed-off-by: Alex Kiernan 
---

 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} |  0
 ...-Do-not-use-LFS64-on-linux-with-musl.patch | 36 +-
 .../rust/files/hardcodepaths.patch|  8 ++-
 ...ibstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} |  0
 72.1.bb => rust-cross-canadian_1.73.0.bb} |  0
 ...ust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} |  0
 meta/recipes-devtools/rust/rust-snapshot.inc  | 68 ---
 meta/recipes-devtools/rust/rust-source.inc|  2 +-
 .../rust/{rust_1.72.1.bb => rust_1.73.0.bb}   |  0
 10 files changed, 55 insertions(+), 61 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.1.bb => cargo_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.1.bb => libstd-rs_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.1.bb => 
rust-cross-canadian_1.73.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.1.bb => rust-llvm_1.73.0.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.1.bb => rust_1.73.0.bb} (100%)

diff --git a/meta/conf/distro/include/tcmode-default.inc 
b/meta/conf/distro/include/tcmode-default.inc
index cdadaef2be34..4219a9b56823 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.5%"
 QEMUVERSION ?= "8.1%"
 GOVERSION ?= "1.20%"
 LLVMVERSION ?= "17.%"
-RUSTVERSION ?= "1.72%"
+RUSTVERSION ?= "1.73%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/rust/cargo_1.72.1.bb 
b/meta/recipes-devtools/rust/cargo_1.73.0.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.1.bb
rename to meta/recipes-devtools/rust/cargo_1.73.0.bb
diff --git 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
index dd23d09101ef..794ad804f0dc 100644
--- 
a/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
+++ 
b/meta/recipes-devtools/rust/files/0001-Do-not-use-LFS64-on-linux-with-musl.patch
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj 
  library/std/src/sys/unix/fs.rs | 27 ---
  3 files changed, 38 insertions(+), 12 deletions(-)
 
-Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs
-+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs
+--- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs
 rustc-1.73.0-src/library/std/src/os/linux/fs.rs
 @@ -329,7 +329,14 @@ pub trait MetadataExt {
  impl MetadataExt for Metadata {
  #[allow(deprecated)]
@@ -39,10 +39,10 @@ Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
  }
  fn st_dev() -> u64 {
  self.as_inner().as_inner().st_dev as u64
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
 @@ -124,9 +124,12 @@ impl FileDesc {
  }
  
@@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
  use libc::pwrite64;
  
  unsafe {
-Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
+Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
 ===
 rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs
-+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
-@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
+--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs
 rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
+@@ -39,9 +39,13 @@ use libc::{c_int, mode_t};
  all(target_os = "linux", target_env = "gnu")
  ))]
  use libc::c_char;
@@ -93,7 +93,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::fstatat64;
  #[cfg(any(
  target_os = "android",
-@@ -64,7 +68,7 @@ use libc::fstatat64;
+@@ -53,7 +57,7 @@ use libc::fstatat64;
  target_os = "vita",
  ))]
  use libc::readdir as readdir64;
@@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
  use libc::readdir64;
  #[cfg(any(target_os = "emscripten", target_os = "l4re"))]
  use libc::readdir64_r;
-@@ -79,6 +83,7 @@ use libc::readdir64_r;
+@@ -68,6 +72,7 @@ use libc::readdir64_

[OE-Core][PATCH 5/7] rust: Upgrade 1.72.0 -> 1.72.1

2023-12-08 Thread Alex Kiernan

https://blog.rust-lang.org/2023/09/19/Rust-1.72.1.html

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} | 0
 .../rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb}   | 0
 ...t-cross-canadian_1.72.0.bb => rust-cross-canadian_1.72.1.bb} | 0
 .../rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.72.0.bb => cargo_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.72.0.bb => libstd-rs_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.72.0.bb => 
rust-cross-canadian_1.72.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.72.0.bb => rust-llvm_1.72.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.72.0.bb => rust_1.72.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.72.0.bb 
b/meta/recipes-devtools/rust/cargo_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.72.0.bb
rename to meta/recipes-devtools/rust/cargo_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.72.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.72.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.72.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.72.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.72.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 8860d116c872..61340f817446 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -6,7 +6,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
 
file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014"
+SRC_URI[rust.sha256sum] = 
"aea58d962ff1c19521b9f587aad88285f0fd35b6b6738b031a7a15bb1b70a7c3"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.72.0.bb 
b/meta/recipes-devtools/rust/rust_1.72.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.72.0.bb
rename to meta/recipes-devtools/rust/rust_1.72.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192066): 
https://lists.openembedded.org/g/openembedded-core/message/192066
Mute This Topic: https://lists.openembedded.org/mt/103055166/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 3/7] rust: Upgrade 1.71.0 -> 1.71.1

2023-12-08 Thread Alex Kiernan

https://blog.rust-lang.org/2023/08/03/Rust-1.71.1.html

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} | 0
 .../rust/{libstd-rs_1.71.0.bb => libstd-rs_1.71.1.bb}   | 0
 ...t-cross-canadian_1.71.0.bb => rust-cross-canadian_1.71.1.bb} | 0
 .../rust/{rust-llvm_1.71.0.bb => rust-llvm_1.71.1.bb}   | 0
 meta/recipes-devtools/rust/rust-source.inc  | 2 +-
 meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb}   | 0
 6 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/rust/{cargo_1.71.0.bb => cargo_1.71.1.bb} (100%)
 rename meta/recipes-devtools/rust/{libstd-rs_1.71.0.bb => libstd-rs_1.71.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.71.0.bb => 
rust-cross-canadian_1.71.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.71.0.bb => rust-llvm_1.71.1.bb} 
(100%)
 rename meta/recipes-devtools/rust/{rust_1.71.0.bb => rust_1.71.1.bb} (100%)

diff --git a/meta/recipes-devtools/rust/cargo_1.71.0.bb 
b/meta/recipes-devtools/rust/cargo_1.71.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.71.0.bb
rename to meta/recipes-devtools/rust/cargo_1.71.1.bb
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.71.0.bb 
b/meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.71.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.71.1.bb
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb 
b/meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.71.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.71.1.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.71.0.bb 
b/meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.71.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.71.1.bb
diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 3a192e42db7d..0729db6f0b45 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,7 @@ SRC_URI += 
"https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
 file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
 
file://0001-musl-Define-SOCK_SEQPACKET-in-common-place.patch;patchdir=${RUSTSRC}
 \
 "
-SRC_URI[rust.sha256sum] = 
"5814699031aafdcc2e2f71fc9b389678cd7042350d1583da061463d8e88681c7"
+SRC_URI[rust.sha256sum] = 
"371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
diff --git a/meta/recipes-devtools/rust/rust_1.71.0.bb 
b/meta/recipes-devtools/rust/rust_1.71.1.bb
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.71.0.bb
rename to meta/recipes-devtools/rust/rust_1.71.1.bb
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192064): 
https://lists.openembedded.org/g/openembedded-core/message/192064
Mute This Topic: https://lists.openembedded.org/mt/103055164/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 1/7] rust: Disable rust oe-selftest

2023-12-08 Thread Alex Kiernan

From: Yash Shinde 

After rust is upgraded to 1.71 and later versions, the rust oe-selftest gives
build errors due to unstable nightly options(see the error mentioned below). 
Thus, disable the test suite
until the issue is fixed

error: the option `Z` is only accepted on the nightly compiler
thread 'main' panicked at 'failed to gather the target spec for 
x86_64-poky-linux-gnu', synthetic_targets.rs:66:9

Following issues are created in Yocto bugzilla and rust upstream to track this 
issue-

https://bugzilla.yoctoproject.org/show_bug.cgi?id=15275
https://github.com/rust-lang/rust/issues/115642
https://users.rust-lang.org/t/does-rust-test-suite-supports-nightly-options-during-bootstrapping-in-rust/103108
https://users.rust-lang.org/t/unable-to-read-target-specs-when-rust-1-73-is-bootstrapped-in-yocto-poky/102959

Signed-off-by: Yash Shinde 
Signed-off-by: Alex Kiernan 
---

 meta/lib/oeqa/selftest/cases/rust.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/rust.py 
b/meta/lib/oeqa/selftest/cases/rust.py
index 7d148142fc78..6dbc51700689 100644
--- a/meta/lib/oeqa/selftest/cases/rust.py
+++ b/meta/lib/oeqa/selftest/cases/rust.py
@@ -39,6 +39,9 @@ def parse_results(filename):
 @OETestTag("runqemu")
 class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase):
 def test_rust(self, *args, **kwargs):
+# Disable Rust Oe-selftest
+self.skipTest("The Rust Oe-selftest is disabled.")
+
 # build remote-test-server before image build
 recipe = "rust"
 start_time = time.time()
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192063): 
https://lists.openembedded.org/g/openembedded-core/message/192063
Mute This Topic: https://lists.openembedded.org/mt/103055162/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH 1/2] rust: Upgrade 1.70.0 -> 1.73.0

2023-12-08 Thread Alex Kiernan

On Fri, Dec 8, 2023 at 9:56 AM Shinde, Yash via lists.openembedded.org
 wrote:
>
> From: Yash Shinde 
>
> In rust 1.72.0 the 'mips*-unknown-linux-gnu*' support demoted from tier2 to 
> tier3.
> The mips bootstrap compiler is removed from src/stage0.json file and
> so the same are removed from rust-snapshot.inc. 
> [https://github.com/rust-lang/rust/releases/tag/1.72.0]
>
> Drop bootstrap_fail.patch, getrandom-open64.patch
> as they are merged in upstream rust.
]>
> Signed-off-by: Yash Shinde 
> ---

If we're going to go down the road of disabling the rust oe-selftest
(and I don't see a better option right now as we're well behind), I
have a series which steps us through each of the releases up to
1.74.0.

It also avoids the need for the library/test hack (upstream has a new
target we can use for libstd).


--
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192061): 
https://lists.openembedded.org/g/openembedded-core/message/192061
Mute This Topic: https://lists.openembedded.org/mt/103052790/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 4/4] cargo: Add CARGO_LOCK_PATH for path to Cargo.lock

2023-12-08 Thread Alex Kiernan

When building a workspace enabled project, the Cargo.lock is found at
the root of the project, not alongside the Cargo.toml. Expose
CARGO_LOCK_PATH so it can be explicitly configured.

Signed-off-by: Alex Kiernan 
---

Changes in v2:
- Change CARGO_LOCK_PATH to a weak-default

 meta/classes-recipe/cargo_common.bbclass | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index 48cdd69bca13..0fb443edbdde 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -40,6 +40,9 @@ CARGO_SRC_DIR ??= ""
 # The actual path to the Cargo.toml
 CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
 
+# Path to Cargo.lock
+CARGO_LOCK_PATH ??= "${@ 
os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH', True)), 
'Cargo.lock')}"
+
 CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}"
 cargo_common_do_configure () {
mkdir -p ${CARGO_HOME}/bitbake
@@ -168,8 +171,7 @@ python cargo_common_do_patch_paths() {
 # here is better than letting cargo tell (in case the file is missing)
 # "Cargo.lock should be modified but --frozen was given"
 
-manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
-lockfile = os.path.join(os.path.dirname(manifest_path), "Cargo.lock")
+lockfile = d.getVar("CARGO_LOCK_PATH", True)
 if not os.path.exists(lockfile):
 bb.fatal(f"{lockfile} file doesn't exist")
 
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192050): 
https://lists.openembedded.org/g/openembedded-core/message/192050
Mute This Topic: https://lists.openembedded.org/mt/103053307/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 3/4] rust: cargo: Convert single-valued variables to weak defaults

2023-12-08 Thread Alex Kiernan

All of these variables are single-valued, so we can use weak-defaults
for them and only see the final assignment after parsing.

Signed-off-by: Alex Kiernan 
---

Changes in v2:
- New in v2

 meta/classes-recipe/cargo_common.bbclass | 6 +++---
 meta/classes-recipe/rust-common.bbclass  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index 509aa195c5fa..48cdd69bca13 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -28,10 +28,10 @@ export PKG_CONFIG_ALLOW_CROSS = "1"
 # Don't instruct cargo to use crates downloaded by bitbake. Some rust packages,
 # for example the rust compiler itself, come with their own vendored sources.
 # Specifying two [source.crates-io] will not work.
-CARGO_DISABLE_BITBAKE_VENDORING ?= "0"
+CARGO_DISABLE_BITBAKE_VENDORING ??= "0"
 
 # Used by libstd-rs to point to the vendor dir included in rustc src
-CARGO_VENDORING_DIRECTORY ?= "${CARGO_HOME}/bitbake"
+CARGO_VENDORING_DIRECTORY ??= "${CARGO_HOME}/bitbake"
 
 # The directory of the Cargo.toml relative to the root directory, per default
 # assume there's a Cargo.toml directly in the root directory
@@ -40,7 +40,7 @@ CARGO_SRC_DIR ??= ""
 # The actual path to the Cargo.toml
 CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
 
-CARGO_RUST_TARGET_CCLD ?= "${RUST_TARGET_CCLD}"
+CARGO_RUST_TARGET_CCLD ??= "${RUST_TARGET_CCLD}"
 cargo_common_do_configure () {
mkdir -p ${CARGO_HOME}/bitbake
 
diff --git a/meta/classes-recipe/rust-common.bbclass 
b/meta/classes-recipe/rust-common.bbclass
index ae96d9c5b1ff..6940093e59bf 100644
--- a/meta/classes-recipe/rust-common.bbclass
+++ b/meta/classes-recipe/rust-common.bbclass
@@ -16,8 +16,8 @@ FILES:${PN}-dbg += "${rustlibdir}/.debug"
 RUSTLIB = "-L ${STAGING_DIR_HOST}${rustlibdir}"
 RUST_DEBUG_REMAP = "--remap-path-prefix=${WORKDIR}=${TARGET_DBGSRC_DIR}"
 RUSTFLAGS += "${RUSTLIB} ${RUST_DEBUG_REMAP}"
-RUSTLIB_DEP ?= "libstd-rs"
-RUST_PANIC_STRATEGY ?= "unwind"
+RUSTLIB_DEP ??= "libstd-rs"
+RUST_PANIC_STRATEGY ??= "unwind"
 
 def target_is_armv7(d):
 '''Determine if target is armv7'''
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192049): 
https://lists.openembedded.org/g/openembedded-core/message/192049
Mute This Topic: https://lists.openembedded.org/mt/103053306/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 1/4] cargo: Rename MANIFEST_PATH -> CARGO_MANIFEST_PATH

2023-12-08 Thread Alex Kiernan

This variable is a piece of recipe configurable interface, scope it with
the class name to make that clear.

Signed-off-by: Alex Kiernan 
---

(no changes since v1)

 meta/classes-recipe/cargo.bbclass| 4 ++--
 meta/classes-recipe/cargo_common.bbclass | 2 +-
 meta/classes-recipe/ptest-cargo.bbclass  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes-recipe/cargo.bbclass 
b/meta/classes-recipe/cargo.bbclass
index 8c0b92df8d33..96a74e2ef1ec 100644
--- a/meta/classes-recipe/cargo.bbclass
+++ b/meta/classes-recipe/cargo.bbclass
@@ -35,7 +35,7 @@ export RUST_BACKTRACE = "1"
 CARGO_SRC_DIR ??= ""
 
 # The actual path to the Cargo.toml
-MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
+CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
 
 RUSTFLAGS ??= ""
 BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
@@ -44,7 +44,7 @@ BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == 
'1']}"
 # and will require an up to date Cargo.lock file.
 # This force the package being built to already ship a Cargo.lock, in the end
 # this is what we want, at least, for reproducibility of the build.
-CARGO_BUILD_FLAGS = "-v --frozen --target ${RUST_HOST_SYS} ${BUILD_MODE} 
--manifest-path=${MANIFEST_PATH}"
+CARGO_BUILD_FLAGS = "-v --frozen --target ${RUST_HOST_SYS} ${BUILD_MODE} 
--manifest-path=${CARGO_MANIFEST_PATH}"
 
 # This is based on the content of CARGO_BUILD_FLAGS and generally will need to
 # change if CARGO_BUILD_FLAGS changes.
diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index b732a1bd9538..bf298e96c745 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -161,7 +161,7 @@ python cargo_common_do_patch_paths() {
 # here is better than letting cargo tell (in case the file is missing)
 # "Cargo.lock should be modified but --frozen was given"
 
-manifest_path = d.getVar("MANIFEST_PATH", True)
+manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
 lockfile = os.path.join(os.path.dirname(manifest_path), "Cargo.lock")
 if not os.path.exists(lockfile):
 bb.fatal(f"{lockfile} file doesn't exist")
diff --git a/meta/classes-recipe/ptest-cargo.bbclass 
b/meta/classes-recipe/ptest-cargo.bbclass
index ff57be852508..c46df362bfee 100644
--- a/meta/classes-recipe/ptest-cargo.bbclass
+++ b/meta/classes-recipe/ptest-cargo.bbclass
@@ -15,7 +15,7 @@ python do_compile_ptest_cargo() {
 cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO", True))
 cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS", True)
 rust_flags = d.getVar("RUSTFLAGS", True)
-manifest_path = d.getVar("MANIFEST_PATH", True)
+manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
 project_manifest_path = os.path.normpath(manifest_path)
 manifest_dir = os.path.dirname(manifest_path)
 
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192047): 
https://lists.openembedded.org/g/openembedded-core/message/192047
Mute This Topic: https://lists.openembedded.org/mt/103053302/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2 2/4] cargo: Move CARGO_MANIFEST_PATH/CARGO_SRC_DIR to cargo_common

2023-12-08 Thread Alex Kiernan

cargo_common_do_configure uses CARGO_MANIFEST_PATH (which depends on
CARGO_SRC_DIR), but their definition was in cargo.bbclass.

Signed-off-by: Alex Kiernan 
---

Changes in v2:
- Drop change from default to weak-defaults

 meta/classes-recipe/cargo.bbclass| 7 ---
 meta/classes-recipe/cargo_common.bbclass | 7 +++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/classes-recipe/cargo.bbclass 
b/meta/classes-recipe/cargo.bbclass
index 96a74e2ef1ec..0829a58dd90f 100644
--- a/meta/classes-recipe/cargo.bbclass
+++ b/meta/classes-recipe/cargo.bbclass
@@ -30,13 +30,6 @@ B = "${WORKDIR}/build"
 # where the issue occured
 export RUST_BACKTRACE = "1"
 
-# The directory of the Cargo.toml relative to the root directory, per default
-# assume there's a Cargo.toml directly in the root directory
-CARGO_SRC_DIR ??= ""
-
-# The actual path to the Cargo.toml
-CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
-
 RUSTFLAGS ??= ""
 BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
 # --frozen flag will prevent network access (which is required since only
diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index bf298e96c745..509aa195c5fa 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -33,6 +33,13 @@ CARGO_DISABLE_BITBAKE_VENDORING ?= "0"
 # Used by libstd-rs to point to the vendor dir included in rustc src
 CARGO_VENDORING_DIRECTORY ?= "${CARGO_HOME}/bitbake"
 
+# The directory of the Cargo.toml relative to the root directory, per default
+# assume there's a Cargo.toml directly in the root directory
+CARGO_SRC_DIR ??= ""
+
+# The actual path to the Cargo.toml
+CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
+
 CARGO_RUST_TARGET_CCLD ?= "${RUST_TARGET_CCLD}"
 cargo_common_do_configure () {
mkdir -p ${CARGO_HOME}/bitbake
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192048): 
https://lists.openembedded.org/g/openembedded-core/message/192048
Mute This Topic: https://lists.openembedded.org/mt/103053304/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 2/3] cargo: Move CARGO_MANIFEST_PATH/CARGO_SRC_DIR to cargo_common

2023-12-08 Thread Alex Kiernan

On Fri, Dec 8, 2023 at 8:15 AM Alex Kiernan via lists.openembedded.org
 wrote:
>
> On Thu, Dec 7, 2023 at 10:40 PM Richard Purdie
>  wrote:
> >
> > On Thu, 2023-12-07 at 13:39 +, Alex Kiernan wrote:
> > > cargo_common_do_configure uses CARGO_MANIFEST_PATH (which depends on
> > > CARGO_SRC_DIR), but their definition was in cargo.bbclass.
> > >
> > > Match the other variables here and change to default values, rather
> > > than weak defaults.
> >
> > FWIW "single value" class variables tend to work much better as ??=
> > (which I'd call default value) since than it doesn't matter if the
> > recipe setting comes before or after the inherit and the inherit
> > position in the recipe doesn't matter.
> >
>
> Ah, I guess that makes sense - for "single value" :append/:remove
> aren't really useful, so leaving the actual assignment as late as
> possible works?
>

And I've just read the bitbake docs and I clearly still don't really
understand... its += / -= rather than append/remove which are the
things which are important here.

> TBH I've never really been very clear what the "right" thing to use is
> between ?= and ??=
>
> > I'd call ?= a weak assignment or weak default.
> >
> > Thanks for working on cleaning some of these things up. I got so far
> > with it originally and then ran out of time (and too frustrated with
> > the long build/test cycles!).
> >
>
> I'll go back and do the opposite cleanup and send a v2.
>
> > Cheers,
> >
> > Richard
> >
> > >
> > > Signed-off-by: Alex Kiernan 
> > > ---
> > >
> > >  meta/classes-recipe/cargo.bbclass| 7 ---
> > >  meta/classes-recipe/cargo_common.bbclass | 7 +++
> > >  2 files changed, 7 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/meta/classes-recipe/cargo.bbclass 
> > > b/meta/classes-recipe/cargo.bbclass
> > > index 96a74e2ef1ec..0829a58dd90f 100644
> > > --- a/meta/classes-recipe/cargo.bbclass
> > > +++ b/meta/classes-recipe/cargo.bbclass
> > > @@ -30,13 +30,6 @@ B = "${WORKDIR}/build"
> > >  # where the issue occured
> > >  export RUST_BACKTRACE = "1"
> > >
> > > -# The directory of the Cargo.toml relative to the root directory, per 
> > > default
> > > -# assume there's a Cargo.toml directly in the root directory
> > > -CARGO_SRC_DIR ??= ""
> > > -
> > > -# The actual path to the Cargo.toml
> > > -CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
> > > -
> > >  RUSTFLAGS ??= ""
> > >  BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
> > >  # --frozen flag will prevent network access (which is required since only
> > > diff --git a/meta/classes-recipe/cargo_common.bbclass 
> > > b/meta/classes-recipe/cargo_common.bbclass
> > > index bf298e96c745..c330c122a9d3 100644
> > > --- a/meta/classes-recipe/cargo_common.bbclass
> > > +++ b/meta/classes-recipe/cargo_common.bbclass
> > > @@ -33,6 +33,13 @@ CARGO_DISABLE_BITBAKE_VENDORING ?= "0"
> > >  # Used by libstd-rs to point to the vendor dir included in rustc src
> > >  CARGO_VENDORING_DIRECTORY ?= "${CARGO_HOME}/bitbake"
> > >
> > > +# The directory of the Cargo.toml relative to the root directory, per 
> > > default
> > > +# assume there's a Cargo.toml directly in the root directory
> > > +CARGO_SRC_DIR ?= ""
> > > +
> > > +# The actual path to the Cargo.toml
> > > +CARGO_MANIFEST_PATH ?= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
> > > +
> > >  CARGO_RUST_TARGET_CCLD ?= "${RUST_TARGET_CCLD}"
> > >  cargo_common_do_configure () {
> > >   mkdir -p ${CARGO_HOME}/bitbake
> > >
> > >
> >
>
>
> --
> Alex Kiernan
>
> 
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192016): 
https://lists.openembedded.org/g/openembedded-core/message/192016
Mute This Topic: https://lists.openembedded.org/mt/103034028/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-Core][PATCH 2/3] cargo: Move CARGO_MANIFEST_PATH/CARGO_SRC_DIR to cargo_common

2023-12-08 Thread Alex Kiernan

On Thu, Dec 7, 2023 at 10:40 PM Richard Purdie
 wrote:
>
> On Thu, 2023-12-07 at 13:39 +, Alex Kiernan wrote:
> > cargo_common_do_configure uses CARGO_MANIFEST_PATH (which depends on
> > CARGO_SRC_DIR), but their definition was in cargo.bbclass.
> >
> > Match the other variables here and change to default values, rather
> > than weak defaults.
>
> FWIW "single value" class variables tend to work much better as ??=
> (which I'd call default value) since than it doesn't matter if the
> recipe setting comes before or after the inherit and the inherit
> position in the recipe doesn't matter.
>

Ah, I guess that makes sense - for "single value" :append/:remove
aren't really useful, so leaving the actual assignment as late as
possible works?

TBH I've never really been very clear what the "right" thing to use is
between ?= and ??=

> I'd call ?= a weak assignment or weak default.
>
> Thanks for working on cleaning some of these things up. I got so far
> with it originally and then ran out of time (and too frustrated with
> the long build/test cycles!).
>

I'll go back and do the opposite cleanup and send a v2.

> Cheers,
>
> Richard
>
> >
> > Signed-off-by: Alex Kiernan 
> > ---
> >
> >  meta/classes-recipe/cargo.bbclass| 7 ---
> >  meta/classes-recipe/cargo_common.bbclass | 7 +++
> >  2 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/meta/classes-recipe/cargo.bbclass 
> > b/meta/classes-recipe/cargo.bbclass
> > index 96a74e2ef1ec..0829a58dd90f 100644
> > --- a/meta/classes-recipe/cargo.bbclass
> > +++ b/meta/classes-recipe/cargo.bbclass
> > @@ -30,13 +30,6 @@ B = "${WORKDIR}/build"
> >  # where the issue occured
> >  export RUST_BACKTRACE = "1"
> >
> > -# The directory of the Cargo.toml relative to the root directory, per 
> > default
> > -# assume there's a Cargo.toml directly in the root directory
> > -CARGO_SRC_DIR ??= ""
> > -
> > -# The actual path to the Cargo.toml
> > -CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
> > -
> >  RUSTFLAGS ??= ""
> >  BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
> >  # --frozen flag will prevent network access (which is required since only
> > diff --git a/meta/classes-recipe/cargo_common.bbclass 
> > b/meta/classes-recipe/cargo_common.bbclass
> > index bf298e96c745..c330c122a9d3 100644
> > --- a/meta/classes-recipe/cargo_common.bbclass
> > +++ b/meta/classes-recipe/cargo_common.bbclass
> > @@ -33,6 +33,13 @@ CARGO_DISABLE_BITBAKE_VENDORING ?= "0"
> >  # Used by libstd-rs to point to the vendor dir included in rustc src
> >  CARGO_VENDORING_DIRECTORY ?= "${CARGO_HOME}/bitbake"
> >
> > +# The directory of the Cargo.toml relative to the root directory, per 
> > default
> > +# assume there's a Cargo.toml directly in the root directory
> > +CARGO_SRC_DIR ?= ""
> > +
> > +# The actual path to the Cargo.toml
> > +CARGO_MANIFEST_PATH ?= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
> > +
> >  CARGO_RUST_TARGET_CCLD ?= "${RUST_TARGET_CCLD}"
> >  cargo_common_do_configure () {
> >   mkdir -p ${CARGO_HOME}/bitbake
> > 
> >
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#192014): 
https://lists.openembedded.org/g/openembedded-core/message/192014
Mute This Topic: https://lists.openembedded.org/mt/103034028/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 3/3] cargo: Add CARGO_LOCK_PATH for path to Cargo.lock

2023-12-07 Thread Alex Kiernan

When building a workspace enabled project, the Cargo.lock is found at
the root of the project, not alongside the Cargo.toml. Expose
CARGO_LOCK_PATH so it can be explicitly configured.

Signed-off-by: Alex Kiernan 
---

 meta/classes-recipe/cargo_common.bbclass | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index c330c122a9d3..a236628664c8 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -40,6 +40,9 @@ CARGO_SRC_DIR ?= ""
 # The actual path to the Cargo.toml
 CARGO_MANIFEST_PATH ?= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
 
+# Path to Cargo.lock
+CARGO_LOCK_PATH ?= "${@ 
os.path.join(os.path.dirname(d.getVar('CARGO_MANIFEST_PATH', True)), 
'Cargo.lock')}"
+
 CARGO_RUST_TARGET_CCLD ?= "${RUST_TARGET_CCLD}"
 cargo_common_do_configure () {
mkdir -p ${CARGO_HOME}/bitbake
@@ -168,8 +171,7 @@ python cargo_common_do_patch_paths() {
 # here is better than letting cargo tell (in case the file is missing)
 # "Cargo.lock should be modified but --frozen was given"
 
-manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
-lockfile = os.path.join(os.path.dirname(manifest_path), "Cargo.lock")
+lockfile = d.getVar("CARGO_LOCK_PATH", True)
 if not os.path.exists(lockfile):
 bb.fatal(f"{lockfile} file doesn't exist")
 
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191956): 
https://lists.openembedded.org/g/openembedded-core/message/191956
Mute This Topic: https://lists.openembedded.org/mt/103034030/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 2/3] cargo: Move CARGO_MANIFEST_PATH/CARGO_SRC_DIR to cargo_common

2023-12-07 Thread Alex Kiernan

cargo_common_do_configure uses CARGO_MANIFEST_PATH (which depends on
CARGO_SRC_DIR), but their definition was in cargo.bbclass.

Match the other variables here and change to default values, rather
than weak defaults.

Signed-off-by: Alex Kiernan 
---

 meta/classes-recipe/cargo.bbclass| 7 ---
 meta/classes-recipe/cargo_common.bbclass | 7 +++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/classes-recipe/cargo.bbclass 
b/meta/classes-recipe/cargo.bbclass
index 96a74e2ef1ec..0829a58dd90f 100644
--- a/meta/classes-recipe/cargo.bbclass
+++ b/meta/classes-recipe/cargo.bbclass
@@ -30,13 +30,6 @@ B = "${WORKDIR}/build"
 # where the issue occured
 export RUST_BACKTRACE = "1"
 
-# The directory of the Cargo.toml relative to the root directory, per default
-# assume there's a Cargo.toml directly in the root directory
-CARGO_SRC_DIR ??= ""
-
-# The actual path to the Cargo.toml
-CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
-
 RUSTFLAGS ??= ""
 BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
 # --frozen flag will prevent network access (which is required since only
diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index bf298e96c745..c330c122a9d3 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -33,6 +33,13 @@ CARGO_DISABLE_BITBAKE_VENDORING ?= "0"
 # Used by libstd-rs to point to the vendor dir included in rustc src
 CARGO_VENDORING_DIRECTORY ?= "${CARGO_HOME}/bitbake"
 
+# The directory of the Cargo.toml relative to the root directory, per default
+# assume there's a Cargo.toml directly in the root directory
+CARGO_SRC_DIR ?= ""
+
+# The actual path to the Cargo.toml
+CARGO_MANIFEST_PATH ?= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
+
 CARGO_RUST_TARGET_CCLD ?= "${RUST_TARGET_CCLD}"
 cargo_common_do_configure () {
mkdir -p ${CARGO_HOME}/bitbake
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191955): 
https://lists.openembedded.org/g/openembedded-core/message/191955
Mute This Topic: https://lists.openembedded.org/mt/103034028/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 1/3] cargo: Rename MANIFEST_PATH -> CARGO_MANIFEST_PATH

2023-12-07 Thread Alex Kiernan

This variable is a piece of recipe configurable interface, scope it with
the class name to make that clear.

Signed-off-by: Alex Kiernan 
---

 meta/classes-recipe/cargo.bbclass| 4 ++--
 meta/classes-recipe/cargo_common.bbclass | 2 +-
 meta/classes-recipe/ptest-cargo.bbclass  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes-recipe/cargo.bbclass 
b/meta/classes-recipe/cargo.bbclass
index 8c0b92df8d33..96a74e2ef1ec 100644
--- a/meta/classes-recipe/cargo.bbclass
+++ b/meta/classes-recipe/cargo.bbclass
@@ -35,7 +35,7 @@ export RUST_BACKTRACE = "1"
 CARGO_SRC_DIR ??= ""
 
 # The actual path to the Cargo.toml
-MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
+CARGO_MANIFEST_PATH ??= "${S}/${CARGO_SRC_DIR}/Cargo.toml"
 
 RUSTFLAGS ??= ""
 BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == '1']}"
@@ -44,7 +44,7 @@ BUILD_MODE = "${@['--release', ''][d.getVar('DEBUG_BUILD') == 
'1']}"
 # and will require an up to date Cargo.lock file.
 # This force the package being built to already ship a Cargo.lock, in the end
 # this is what we want, at least, for reproducibility of the build.
-CARGO_BUILD_FLAGS = "-v --frozen --target ${RUST_HOST_SYS} ${BUILD_MODE} 
--manifest-path=${MANIFEST_PATH}"
+CARGO_BUILD_FLAGS = "-v --frozen --target ${RUST_HOST_SYS} ${BUILD_MODE} 
--manifest-path=${CARGO_MANIFEST_PATH}"
 
 # This is based on the content of CARGO_BUILD_FLAGS and generally will need to
 # change if CARGO_BUILD_FLAGS changes.
diff --git a/meta/classes-recipe/cargo_common.bbclass 
b/meta/classes-recipe/cargo_common.bbclass
index b732a1bd9538..bf298e96c745 100644
--- a/meta/classes-recipe/cargo_common.bbclass
+++ b/meta/classes-recipe/cargo_common.bbclass
@@ -161,7 +161,7 @@ python cargo_common_do_patch_paths() {
 # here is better than letting cargo tell (in case the file is missing)
 # "Cargo.lock should be modified but --frozen was given"
 
-manifest_path = d.getVar("MANIFEST_PATH", True)
+manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
 lockfile = os.path.join(os.path.dirname(manifest_path), "Cargo.lock")
 if not os.path.exists(lockfile):
 bb.fatal(f"{lockfile} file doesn't exist")
diff --git a/meta/classes-recipe/ptest-cargo.bbclass 
b/meta/classes-recipe/ptest-cargo.bbclass
index ff57be852508..c46df362bfee 100644
--- a/meta/classes-recipe/ptest-cargo.bbclass
+++ b/meta/classes-recipe/ptest-cargo.bbclass
@@ -15,7 +15,7 @@ python do_compile_ptest_cargo() {
 cargo = bb.utils.which(d.getVar("PATH"), d.getVar("CARGO", True))
 cargo_build_flags = d.getVar("CARGO_BUILD_FLAGS", True)
 rust_flags = d.getVar("RUSTFLAGS", True)
-manifest_path = d.getVar("MANIFEST_PATH", True)
+manifest_path = d.getVar("CARGO_MANIFEST_PATH", True)
 project_manifest_path = os.path.normpath(manifest_path)
 manifest_dir = os.path.dirname(manifest_path)
 
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191954): 
https://lists.openembedded.org/g/openembedded-core/message/191954
Mute This Topic: https://lists.openembedded.org/mt/103034027/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to customize sshd mode

2023-12-07 Thread Alex Kiernan

On Thu, Dec 7, 2023 at 2:10 AM Yu, Mingli  wrote:
>
> Hi Alex,
>
> Thanks for your suggestion!
>
> Both sshd.socket and sshd.service belong to openssh-sshd package, so using 
> SYSTEMD_AUTO_ENABLE can't enable one of them,  it just can enable both or 
> disable both.
>

Yes, it would need changes to support per-service presets, which I
suspect would be generally useful.

> Thanks,
> ____
> From: Alex Kiernan 
> Sent: Wednesday, December 6, 2023 18:37
> To: Yu, Mingli 
> Cc: openembedded-core@lists.openembedded.org 
> 
> Subject: Re: [OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to 
> customize sshd mode
>
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and 
> know the content is safe.
>
> On Wed, Dec 6, 2023 at 8:56 AM Yu, Mingli  wrote:
> >
> > From: Mingli Yu 
> >
> > Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
> > and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
> > sshd.service.
> >
> > The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
> > and user can customize the above two PACKAGECONFIG option to choose the
> > sshd mode.
> >
> > Signed-off-by: Mingli Yu 
> > ---
> > Changed in v3:
> > rebase based on 
> > https://lore.kernel.org/all/20231201140947.792594-1-xiangyu.c...@eng.windriver.com/
> >
> > Changed in v4:
> > make it possible to install both sshd.socket and sshd.service
>
> I'm wondering if we should make SYSTEMD_AUTO_ENABLE settable per
> service, so you could then install both and manage which one is active
> with a preset.
>
> > .../openssh/openssh_9.5p1.bb  | 25 ++-
> >  1 file changed, 19 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb 
> > b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> > index 2c1c821ea9..58dd030c64 100644
> > --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> > +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> > @@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
> >  INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
> >
> >  SYSTEMD_PACKAGES = "${PN}-sshd"
> > -SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
> > +SYSTEMD_SERVICE:${PN}-sshd = 
> > "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket',
> >  '', d)} 
> > ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
> >  '', d)}"
> >
> >  inherit autotools-brokensep ptest pkgconfig
> >
> > -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> > +# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
> > +# corresponding to sshd.service
> > +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} 
> > systemd-sshd-socket-mode"
> >  PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
> >  PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
> >  PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
> >  PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
> >  PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
> > +PACKAGECONFIG[systemd-sshd-socket-mode] = ""
> > +PACKAGECONFIG[systemd-sshd-service-mode] = ""
> >
> >  EXTRA_AUTORECONF += "--exclude=aclocal"
> >
> > @@ -124,15 +128,24 @@ do_install:append () {
> > echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> 
> > ${D}${sysconfdir}/ssh/sshd_config_readonly
> >
> > install -d ${D}${systemd_system_unitdir}
> > -   install -c -m 0644 ${WORKDIR}/sshd.socket 
> > ${D}${systemd_system_unitdir}
> > -   install -c -m 0644 ${WORKDIR}/sshd.service 
> > ${D}${systemd_system_unitdir}
> > -   install -c -m 0644 ${WORKDIR}/sshd@.service 
> > ${D}${systemd_system_unitdir}
> > +   if 
> > ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
> >  then
> > +   install -c -m 0644 ${WORKDIR}/sshd.socket 
> > ${D}${systemd_system_unitdir}
> > +   install -c -m 0644 ${WORKDIR}/sshd@.service 
> > ${D}${systemd_system_unitdir}
> > +   sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> > +   -e '

Re: [OE-core] [PATCH v4] openssh: Add PACKAGECONFIG option to customize sshd mode

2023-12-06 Thread Alex Kiernan

On Wed, Dec 6, 2023 at 8:56 AM Yu, Mingli  wrote:
>
> From: Mingli Yu 
>
> Add systemd-sshd-socket-mode PACKAGECONFIG option to choose sshd.socket
> and systemd-sshd-service-mode PACKAGECONFIG option to choose installing
> sshd.service.
>
> The systemd-sshd-socket-mode PACKAGECONFIG option is enabled by default
> and user can customize the above two PACKAGECONFIG option to choose the
> sshd mode.
>
> Signed-off-by: Mingli Yu 
> ---
> Changed in v3:
> rebase based on 
> https://lore.kernel.org/all/20231201140947.792594-1-xiangyu.c...@eng.windriver.com/
>
> Changed in v4:
> make it possible to install both sshd.socket and sshd.service

I'm wondering if we should make SYSTEMD_AUTO_ENABLE settable per
service, so you could then install both and manage which one is active
with a preset.

> .../openssh/openssh_9.5p1.bb  | 25 ++-
>  1 file changed, 19 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb 
> b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> index 2c1c821ea9..58dd030c64 100644
> --- a/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_9.5p1.bb
> @@ -50,16 +50,20 @@ INITSCRIPT_NAME:${PN}-sshd = "sshd"
>  INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9"
>
>  SYSTEMD_PACKAGES = "${PN}-sshd"
> -SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket sshd.service"
> +SYSTEMD_SERVICE:${PN}-sshd = 
> "${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','sshd.socket',
>  '', d)} 
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','sshd.service',
>  '', d)}"
>
>  inherit autotools-brokensep ptest pkgconfig
>
> -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> +# systemd-sshd-socket-mode means sshd.socket and systemd-sshd-service-mode
> +# corresponding to sshd.service
> +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} 
> systemd-sshd-socket-mode"
>  PACKAGECONFIG[kerberos] = "--with-kerberos5,--without-kerberos5,krb5"
>  PACKAGECONFIG[ldns] = "--with-ldns,--without-ldns,ldns"
>  PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
>  PACKAGECONFIG[manpages] = "--with-mantype=man,--with-mantype=cat"
>  PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
> +PACKAGECONFIG[systemd-sshd-socket-mode] = ""
> +PACKAGECONFIG[systemd-sshd-service-mode] = ""
>
>  EXTRA_AUTORECONF += "--exclude=aclocal"
>
> @@ -124,15 +128,24 @@ do_install:append () {
> echo "HostKey /var/run/ssh/ssh_host_ed25519_key" >> 
> ${D}${sysconfdir}/ssh/sshd_config_readonly
>
> install -d ${D}${systemd_system_unitdir}
> -   install -c -m 0644 ${WORKDIR}/sshd.socket 
> ${D}${systemd_system_unitdir}
> -   install -c -m 0644 ${WORKDIR}/sshd.service 
> ${D}${systemd_system_unitdir}
> -   install -c -m 0644 ${WORKDIR}/sshd@.service 
> ${D}${systemd_system_unitdir}
> +   if 
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-socket-mode','true','false',d)};
>  then
> +   install -c -m 0644 ${WORKDIR}/sshd.socket 
> ${D}${systemd_system_unitdir}
> +   install -c -m 0644 ${WORKDIR}/sshd@.service 
> ${D}${systemd_system_unitdir}
> +   sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> +   -e 's,@SBINDIR@,${sbindir},g' \
> +   -e 's,@BINDIR@,${bindir},g' \
> +   -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> +${D}${systemd_system_unitdir}/sshd.socket
> +   fi
> +   if 
> ${@bb.utils.contains('PACKAGECONFIG','systemd-sshd-service-mode','true','false',d)};
>  then
> +   install -c -m 0644 ${WORKDIR}/sshd.service 
> ${D}${systemd_system_unitdir}
> +   fi
> install -c -m 0644 ${WORKDIR}/sshdgenkeys.service 
> ${D}${systemd_system_unitdir}
> sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
> -e 's,@SBINDIR@,${sbindir},g' \
> -e 's,@BINDIR@,${bindir},g' \
> -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> -   ${D}${systemd_system_unitdir}/sshd.socket 
> ${D}${systemd_system_unitdir}/*.service
> +   ${D}${systemd_system_unitdir}/*.service
>
> sed -i -e 's,@LIBEXECDIR@,${libexecdir}/${BPN},g' \
> ${D}${sysconfdir}/init.d/sshd
> --
> 2.25.1
>
>
> 
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191882): 
https://lists.openembedded.org/g/openembedded-core/message/191882
Mute This Topic: https://lists.openembedded.org/mt/103009646/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH] rust: Drop targets and hosts override magic

2023-12-01 Thread Alex Kiernan

`targets` and `hosts` could be overridden prior to 0a01b5ab973e
("rust-cross-canadian: Simplify and fix"), that commit deleted this
usage, remove the remnant of it from here.

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/rust_1.70.0.bb | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust_1.70.0.bb 
b/meta/recipes-devtools/rust/rust_1.70.0.bb
index 6a28dc926ed2..3d176e54c15c 100644
--- a/meta/recipes-devtools/rust/rust_1.70.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.70.0.bb
@@ -154,13 +154,9 @@ python do_configure() {
 
 config.set("build", "vendor", e(True))
 
-if not "targets" in locals():
-targets = [d.getVar("RUST_TARGET_SYS")]
-config.set("build", "target", e(targets))
+config.set("build", "target", e([d.getVar("RUST_TARGET_SYS")]))
 
-if not "hosts" in locals():
-hosts = [d.getVar("RUST_HOST_SYS")]
-config.set("build", "host", e(hosts))
+config.set("build", "host", e([d.getVar("RUST_HOST_SYS")]))
 
 # We can't use BUILD_SYS since that is something the rust snapshot knows
 # nothing about when trying to build some stage0 tools (like fabricate)
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191683): 
https://lists.openembedded.org/g/openembedded-core/message/191683
Mute This Topic: https://lists.openembedded.org/mt/102921844/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH v2] eudev: Upgrade 3.2.12 -> 3.2.14

2023-11-29 Thread Alex Kiernan

Drop merged patches:

  0001-Export-dummies-for.patch
  0002-Bump-udev-version-to-251.patch

Boian Bonev (13):
  Update as per IRC discussion
  Bump udev version to 251
  Export dummies for
  bump version to 3.2.14
  Fix := not preventing further assignments to RUN
  Add /usr/local/lib/udev/rules.d
  Move the changes from udev.7 to udev.xml
  Regenerate according to 0cf14fb and e5e4013
  Improve wording and restore lines lost in merges
  Improve wording
  Tabs to spaces
  Ensure that standard file descriptors are open
  Commit the generated man page

NaofumiHonda (1):
  Clear sysattr cache if a null pointer is passed (#255)

Vivien Kraus (6):
  Let libudev find hwdb.bin under UDEV_HWDB_BIN
  Add a generic --output argument to udevadm hwdb
  Dynamically get the udevadm hwdb files with a path variable
  fixup! Dynamically get the udevadm hwdb files with a path variable
  Remove references to /run/udev/hwdb.d
  Clarify the /etc/udev/hwdb.d file override with respect to UDEV_HWDB_PATH

Signed-off-by: Alex Kiernan 
---

Changes in v2:
- Correct new version in commit subject (3.2.14)

 .../udev/eudev/0001-Export-dummies-for.patch  | 82 ---
 .../eudev/0002-Bump-udev-version-to-251.patch | 23 --
 .../udev/{eudev_3.2.12.bb => eudev_3.2.14.bb} |  4 +-
 3 files changed, 1 insertion(+), 108 deletions(-)
 delete mode 100644 meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch
 delete mode 100644 
meta/recipes-core/udev/eudev/0002-Bump-udev-version-to-251.patch
 rename meta/recipes-core/udev/{eudev_3.2.12.bb => eudev_3.2.14.bb} (93%)

diff --git a/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch 
b/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch
deleted file mode 100644
index 21fbf0f824a1..
--- a/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 45634cc0f09ea354be7efce2ae3d3fa8ffc181ec Mon Sep 17 00:00:00 2001
-From: Boian Bonev 
-Date: Fri, 11 Aug 2023 23:14:02 +
-Subject: [PATCH] Export dummies for
-
- - udev_device_has_current_tag
- - udev_device_get_current_tags_list_entry
-
-since the current eudev device database does not support the concept of
-current tags
-
-Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/253]
-Signed-off-by: Alexander Kanavin 

- src/libudev/libudev-device.c | 11 +++
- src/libudev/libudev.h|  2 ++
- src/libudev/libudev.sym  |  6 ++
- 3 files changed, 19 insertions(+)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index ac67ce8..7d7a662 100644
 a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry 
*udev_device_get_tags_list_entry(struct udev_dev
- return udev_list_get_entry(_device->tags_list);
- }
- 
-+_public_ struct udev_list_entry 
*udev_device_get_current_tags_list_entry(struct udev_device *udev_device)
-+{
-+// TODO: eudev database does not support current tags
-+return udev_device_get_tags_list_entry(udev_device);
-+}
-+
- /**
-  * udev_device_has_tag:
-  * @udev_device: udev device
-@@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device 
*udev_device, const char *ta
- return false;
- }
- 
-+_public_ int udev_device_has_current_tag(struct udev_device *udev_device, 
const char *tag) {
-+// TODO: eudev database does not support current tags
-+return udev_device_has_tag(udev_device, tag);
-+}
-+
- #define ENVP_SIZE128
- #define MONITOR_BUF_SIZE4096
- static int update_envp_monitor_buf(struct udev_device *udev_device)
-diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
-index 8491d2b..0202964 100644
 a/src/libudev/libudev.h
-+++ b/src/libudev/libudev.h
-@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device 
*udev_device);
- struct udev_list_entry *udev_device_get_devlinks_list_entry(struct 
udev_device *udev_device);
- struct udev_list_entry *udev_device_get_properties_list_entry(struct 
udev_device *udev_device);
- struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device 
*udev_device);
-+struct udev_list_entry *udev_device_get_current_tags_list_entry(struct 
udev_device *udev_device);
- struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device 
*udev_device);
- const char *udev_device_get_property_value(struct udev_device *udev_device, 
const char *key);
- const char *udev_device_get_driver(struct udev_device *udev_device);
-@@ -110,6 +111,7 @@ unsigned long long int 
udev_device_get_usec_since_initialized(struct udev_device
- const char *udev_device_get_sysattr_value(struct udev_device *udev_device, 
const char *sysattr);
- int udev_device_set_sysattr_value(struct udev_device *udev_device, const char 
*sysattr, char *value);
- int udev_device_has_tag(struct ud

[OE-Core][PATCH] eudev: Upgrade 3.2.12 -> 3.12.14

2023-11-29 Thread Alex Kiernan

Drop merged patches:

  0001-Export-dummies-for.patch
  0002-Bump-udev-version-to-251.patch

Boian Bonev (13):
  Update as per IRC discussion
  Bump udev version to 251
  Export dummies for
  bump version to 3.2.14
  Fix := not preventing further assignments to RUN
  Add /usr/local/lib/udev/rules.d
  Move the changes from udev.7 to udev.xml
  Regenerate according to 0cf14fb and e5e4013
  Improve wording and restore lines lost in merges
  Improve wording
  Tabs to spaces
  Ensure that standard file descriptors are open
  Commit the generated man page

NaofumiHonda (1):
  Clear sysattr cache if a null pointer is passed (#255)

Vivien Kraus (6):
  Let libudev find hwdb.bin under UDEV_HWDB_BIN
  Add a generic --output argument to udevadm hwdb
  Dynamically get the udevadm hwdb files with a path variable
  fixup! Dynamically get the udevadm hwdb files with a path variable
  Remove references to /run/udev/hwdb.d
  Clarify the /etc/udev/hwdb.d file override with respect to UDEV_HWDB_PATH

Signed-off-by: Alex Kiernan 
---

 .../udev/eudev/0001-Export-dummies-for.patch  | 82 ---
 .../eudev/0002-Bump-udev-version-to-251.patch | 23 --
 .../udev/{eudev_3.2.12.bb => eudev_3.2.14.bb} |  4 +-
 3 files changed, 1 insertion(+), 108 deletions(-)
 delete mode 100644 meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch
 delete mode 100644 
meta/recipes-core/udev/eudev/0002-Bump-udev-version-to-251.patch
 rename meta/recipes-core/udev/{eudev_3.2.12.bb => eudev_3.2.14.bb} (93%)

diff --git a/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch 
b/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch
deleted file mode 100644
index 21fbf0f824a1..
--- a/meta/recipes-core/udev/eudev/0001-Export-dummies-for.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 45634cc0f09ea354be7efce2ae3d3fa8ffc181ec Mon Sep 17 00:00:00 2001
-From: Boian Bonev 
-Date: Fri, 11 Aug 2023 23:14:02 +
-Subject: [PATCH] Export dummies for
-
- - udev_device_has_current_tag
- - udev_device_get_current_tags_list_entry
-
-since the current eudev device database does not support the concept of
-current tags
-
-Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/253]
-Signed-off-by: Alexander Kanavin 

- src/libudev/libudev-device.c | 11 +++
- src/libudev/libudev.h|  2 ++
- src/libudev/libudev.sym  |  6 ++
- 3 files changed, 19 insertions(+)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index ac67ce8..7d7a662 100644
 a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -1819,6 +1819,12 @@ _public_ struct udev_list_entry 
*udev_device_get_tags_list_entry(struct udev_dev
- return udev_list_get_entry(_device->tags_list);
- }
- 
-+_public_ struct udev_list_entry 
*udev_device_get_current_tags_list_entry(struct udev_device *udev_device)
-+{
-+// TODO: eudev database does not support current tags
-+return udev_device_get_tags_list_entry(udev_device);
-+}
-+
- /**
-  * udev_device_has_tag:
-  * @udev_device: udev device
-@@ -1842,6 +1848,11 @@ _public_ int udev_device_has_tag(struct udev_device 
*udev_device, const char *ta
- return false;
- }
- 
-+_public_ int udev_device_has_current_tag(struct udev_device *udev_device, 
const char *tag) {
-+// TODO: eudev database does not support current tags
-+return udev_device_has_tag(udev_device, tag);
-+}
-+
- #define ENVP_SIZE128
- #define MONITOR_BUF_SIZE4096
- static int update_envp_monitor_buf(struct udev_device *udev_device)
-diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
-index 8491d2b..0202964 100644
 a/src/libudev/libudev.h
-+++ b/src/libudev/libudev.h
-@@ -100,6 +100,7 @@ int udev_device_get_is_initialized(struct udev_device 
*udev_device);
- struct udev_list_entry *udev_device_get_devlinks_list_entry(struct 
udev_device *udev_device);
- struct udev_list_entry *udev_device_get_properties_list_entry(struct 
udev_device *udev_device);
- struct udev_list_entry *udev_device_get_tags_list_entry(struct udev_device 
*udev_device);
-+struct udev_list_entry *udev_device_get_current_tags_list_entry(struct 
udev_device *udev_device);
- struct udev_list_entry *udev_device_get_sysattr_list_entry(struct udev_device 
*udev_device);
- const char *udev_device_get_property_value(struct udev_device *udev_device, 
const char *key);
- const char *udev_device_get_driver(struct udev_device *udev_device);
-@@ -110,6 +111,7 @@ unsigned long long int 
udev_device_get_usec_since_initialized(struct udev_device
- const char *udev_device_get_sysattr_value(struct udev_device *udev_device, 
const char *sysattr);
- int udev_device_set_sysattr_value(struct udev_device *udev_device, const char 
*sysattr, char *value);
- int udev_device_has_tag(struct udev_device *udev_device, const char *tag);
-+int udev_device_has_cu

[OE-core] Rust and oe-selftest

2023-11-24 Thread Alex Kiernan

I wanted to write down where I've got to in digging into the rust
oe-selftest failure... much of this is probably repeating things which
have already been said/are in the ticket
(https://bugzilla.yoctoproject.org/show_bug.cgi?id=15275), but it
feels like it needs more discussion than ticketing...

As far as I can tell what we've tripped over (based on my reading of
the code), is that upstream rust only runs their test suite on
nightlies, not on releases and the test suite is now using features
that are only available in nightlies and are explicitly disabled in
releases (either through build time configuration, or run time
checks).

1.71.0 is where it all breaks, the changes which are introduced in
that extend the testing to cover the bootstrap process, which then
makes unpicking those changes all but impossible. I suspect we could
patch the build so that the run time checks which we trip over could
be bypassed, but it feels like that would move us to a long running
world of pain which is going to need people who really know what
they're doing with a rust codebase (which is definitely not me!)

We're now 4 releases behind on rust, with a couple of point releases
mixed into that. There's really only two ways forward I can see: find
someone to unpick this with upstream and make testing in release a
thing that they test, or drop the rust test suite from oe-selftest.

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191216): 
https://lists.openembedded.org/g/openembedded-core/message/191216
Mute This Topic: https://lists.openembedded.org/mt/102786409/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [PATCH V2] [OE-core] tzdata: Reduced time zone configuration

2023-11-24 Thread Alex Kiernan

On Fri, Nov 24, 2023 at 2:12 PM Alex Kiernan via
lists.openembedded.org 
wrote:
>
> On Fri, Nov 24, 2023 at 6:21 AM Xu, Lizhi via lists.openembedded.org
>  wrote:
> >
> > tzdata.bb by default pulls in all possible timezone data packages which
> > increases size of the final root filesystem considerably.
> > The customer would like to have extra timezones configurable so that only
> > tzdata-core is chosen by default and rest of the zones are optional.
> > This change would make the fs size a lot smaller.
> >
> > Comparison of customized package volume before and after:
> > When TZ_PACKAGES contains all tzdata packets, the image size of tzdata is 
> > 7.4MB.
> > The difference in mirror size between the two is 7MB.
> >
> > When TZ_PACKAGES only retains one tzdata-core, the image size generated by
> > tzdata is 320KB.
> >
> > Signed-off-by: Lizhi Xu 
>
> I get what you're trying to do, but this looks horrid. How about
> splitting into multiple packages based on top level directory (plus
> the few which sit in the top level directory) using a new
> PACKAGESPLITFUNCS so you don't have to hardcode the list of packages?
>

Foolishly, I didn't actually look at what was in the tzdata recipe
first and it already splits things... I'm lost, can't you just remove
things from TZ_PACKAGES to get what you're after?

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191209): 
https://lists.openembedded.org/g/openembedded-core/message/191209
Mute This Topic: https://lists.openembedded.org/mt/102777104/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 1/2] rust: Delete python2 configparser code path

2023-11-24 Thread Alex Kiernan

We no longer support python2, remove the python2 fallback code.

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/rust_1.70.0.bb | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust_1.70.0.bb 
b/meta/recipes-devtools/rust/rust_1.70.0.bb
index 16d433910f8e..2e34b3de1c45 100644
--- a/meta/recipes-devtools/rust/rust_1.70.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.70.0.bb
@@ -72,10 +72,7 @@ do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER"
 
 python do_configure() {
 import json
-try:
-import configparser
-except ImportError:
-import ConfigParser as configparser
+import configparser
 
 # toml is rather similar to standard ini like format except it likes values
 # that look more JSON like. So for our purposes simply escaping all values
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191203): 
https://lists.openembedded.org/g/openembedded-core/message/191203
Mute This Topic: https://lists.openembedded.org/mt/102781413/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-Core][PATCH 2/2] rust: Drop TARGET_VENDOR export

2023-11-24 Thread Alex Kiernan

This was used by crossbeam_atomic.patch, but that patch was removed as
part of the 1.69.0 upgrade.

Signed-off-by: Alex Kiernan 
---

 meta/recipes-devtools/rust/rust-source.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust-source.inc 
b/meta/recipes-devtools/rust/rust-source.inc
index 4a720e645bf4..7a0790f6b62c 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -12,8 +12,5 @@ SRC_URI[rust.sha256sum] = 
"bb8e9c564566b2d3228d95de9063a9254182446a161353f1d843b
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
-# Used by crossbeam_atomic.patch
-export TARGET_VENDOR
-
 UPSTREAM_CHECK_URI = 
"https://forge.rust-lang.org/infra/other-installation-methods.html;
 UPSTREAM_CHECK_REGEX = "rustc-(?P\d+(\.\d+)+)-src"
-- 
2.39.0


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191204): 
https://lists.openembedded.org/g/openembedded-core/message/191204
Mute This Topic: https://lists.openembedded.org/mt/102781414/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [PATCH V2] [OE-core] tzdata: Reduced time zone configuration

2023-11-24 Thread Alex Kiernan

On Fri, Nov 24, 2023 at 6:21 AM Xu, Lizhi via lists.openembedded.org
 wrote:
>
> tzdata.bb by default pulls in all possible timezone data packages which
> increases size of the final root filesystem considerably.
> The customer would like to have extra timezones configurable so that only
> tzdata-core is chosen by default and rest of the zones are optional.
> This change would make the fs size a lot smaller.
>
> Comparison of customized package volume before and after:
> When TZ_PACKAGES contains all tzdata packets, the image size of tzdata is 
> 7.4MB.
> The difference in mirror size between the two is 7MB.
>
> When TZ_PACKAGES only retains one tzdata-core, the image size generated by
> tzdata is 320KB.
>
> Signed-off-by: Lizhi Xu 

I get what you're trying to do, but this looks horrid. How about
splitting into multiple packages based on top level directory (plus
the few which sit in the top level directory) using a new
PACKAGESPLITFUNCS so you don't have to hardcode the list of packages?

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191202): 
https://lists.openembedded.org/g/openembedded-core/message/191202
Mute This Topic: https://lists.openembedded.org/mt/102777104/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [RFC 1/5] valgrind: make ptest depend on all components

2023-11-17 Thread Alex Kiernan

On Wed, Nov 15, 2023 at 4:30 PM Randy MacLeod via
lists.openembedded.org
 wrote:
>
> On 2023-11-15 9:48 a.m., Alexander Kanavin wrote:
>
...
> Rust would be nice to do too.
>
> Indeed.
>
> Yash and Sundeep have 1.72/1.73 updated and are working on
>
> getting the test suite to work but struggling with that.
> I asked him to track what's happening in:
>https://bugzilla.yoctoproject.org/show_bug.cgi?id=15275
>

I did start looking at this... mostly I've failed to find enough time
to even get to the point where I've got a useful environment for
running the tests outside of bitbake (and hence avoid a complete rust
build cycle).

Rust 1.74.0 landed yesterday, so I'm going to have another look... if
it's useful to anyone my (very much WIP) tree is here:

https://github.com/akiernan/poky


--
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#190847): 
https://lists.openembedded.org/g/openembedded-core/message/190847
Mute This Topic: https://lists.openembedded.org/mt/102477896/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH v3] rust: Upgrade 1.70.0 -> 1.71.0

2023-10-18 Thread Alex Kiernan

On Sat, Aug 26, 2023 at 12:17 AM Randy MacLeod via
lists.openembedded.org
 wrote:
>
> On 2023-08-25 11:30, Shinde, Yash wrote:
>
> Hi Luca,
>
> The current version of Rust Oe-selftest is based on Rust 1.70 and works well 
> there. It is yet to be updated for Rust 1.71 (eventually 1.72 which is 
> latest). With every new Rust version there are newly test cases added from 
> which some might fail leading to failure of Rust Oe-selftest.
>
> The patch sent here is only for Rust version update and not for Rust 
> Oe-selftest. The Rust Oe-selftest would be updated to recent versions after 
> the Rust update is done.
>
> We need to do both steps in on patch series.
>
>
>
> The Rust Oe-selftest fails since it is still on Rust 1.70 and the Rust 
> version is updated to 1.71 here. Parallelly will start to rebase Rust 
> Oe-selftest on the latest versions.
>

Is anyone working on the oe-selftest updates at this point? It's
looking likely I'll have a bit of time available in a week or so, so I
could look at it, if no one else is?


> Thanks.
>
> Send the 1.70 -> 1.71 update along with the Rust Oe-selftest using 1.71 as 
> one series of commits.
>
> ../Randy
>
>
>
> Regards,
> Yash
>
>
>
> From: Luca Ceresoli
> Sent: 25 August 2023 18:50
> To: Shinde, Yash via lists.openembedded.org
> Cc: Shinde, Yash; openembedded-core@lists.openembedded.org; MacLeod, Randy; 
> Kallapa, Umesh; Gowda, Naveen; Kokkonda, Sundeep; Moodalappa, Shivaprasad
> Subject: Re: [OE-core] [PATCH v3] rust: Upgrade 1.70.0 -> 1.71.0
>
>
>
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and 
> know the content is safe.
>
> Hello Yash,
>
> On Thu, 24 Aug 2023 07:30:18 -0700
> "Shinde, Yash via lists.openembedded.org"
>  wrote:
>
> > Switch libstd-rs to use the dummy `sysroot` crate which represents the
> > standard library crates. Target getrandom-open64.patch at 0.2.8 (merged
> > for 0.2.9).
> >
> > Drop bootstrap_fail.patch as it is merged in upstream rust.
> >
> > Signed-off-by: Yash Shinde 
>
> The rust.RustSelfTestSystemEmulated.test_rust test is failing on the
> ABs with this patch applied:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/146/builds/408/steps/12/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/154/builds/407/steps/12/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/147/builds/407/steps/12/logs/stdio
>
> Luca
>
> --
> Luca Ceresoli, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
>
>
>
> --
> # Randy MacLeod
> # Wind River Linux
>
>
> 
>


--
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189420): 
https://lists.openembedded.org/g/openembedded-core/message/189420
Mute This Topic: https://lists.openembedded.org/mt/100936266/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] Feature request: Add btop resource monitor

2023-10-16 Thread Alex Kiernan

On Sat, Oct 14, 2023 at 10:11 PM Jan Claußen  wrote:
>
> Another thing is that btop is dependent on a utf-8 locale being set. You can 
> still run it with the --force-utf8 flag though. Should this be set by the 
> recipe as well?
>
> On Okt. 14 2023, at 11:06 pm, Jan Claußen  wrote:
>
> Hi guys,
>
> I would like to add btop to the openembedded-core. The package does now 
> support cmake, which eases the maintenance effort.
> Before it would have involved a lot of patching as seen here. The Cmake 
> support is listed as community maintained though, if that is a show stopper.
>

Feels more like meta-oe rather than oe-core (and the recipe path you
have suggests that's what you intended!)

> tree 7370f6d34c4f1a7d3aed8ef4dc334de1e271e4b3
> parent d59f6c752927f7846dc11c4aa00a2d0c9860e75c
> author Jan Claußen  Sat Oct 14 22:56:45 2023 +0200
> committer Jan Claußen  Sat Oct 14 22:56:45 2023 +0200
>
> recipes-support: Add btop
>
>
> diff --git a/meta-oe/recipes-support/btop/btop_1.2.13.bb 
> b/meta-oe/recipes-support/btop/btop_1.2.13.bb
> new file mode 100644
> index 0..f780a993a
> --- /dev/null
> +++ b/meta-oe/recipes-support/btop/btop_1.2.13.bb
> @@ -0,0 +1,23 @@
> +SUMMARY = "Resource monitor that shows usage and stats for processor, 
> memory, disks, network and processes."
> +HOMEPAGE = "https://github.com/aristocratos/btop;
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
> +SECTION = "console/utils"
> +
> +SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main"
> +SRCREV = "2a864f6f2ea60df16b3f015885eb3c18a48b9b78"
> +
> +S = "${WORKDIR}/git"
> +
> +inherit cmake
> +
> +FILES:${PN} += " \
> +/usr/share/icons \

You only need the top level directory as the packaging recursively
globs. Also this should be ${datadir}/icons

> +/usr/share/icons/hicolor \
> +/usr/share/icons/hicolor/48x48 \
> +/usr/share/icons/hicolor/scalable \
> +    /usr/share/icons/hicolor/48x48/apps \
> +/usr/share/icons/hicolor/48x48/apps/btop.png \
> +/usr/share/icons/hicolor/scalable/apps \
> +/usr/share/icons/hicolor/scalable/apps/btop.svg \
> +"
>
>
>
> 
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189270): 
https://lists.openembedded.org/g/openembedded-core/message/189270
Mute This Topic: https://lists.openembedded.org/mt/101967134/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] why does rust recipe file define "rust_do_install()"?

2023-10-13 Thread Alex Kiernan

On Fri, Oct 13, 2023 at 9:21 AM Robert P. J. Day  wrote:
>
>
>   i'm perusing the rust_1.70.0.bb recipe file, and i'm puzzled by the
> fact that it defines its own do_install() to simply call
> rust_do_install(), which then implements variations of that function:
>
> https://git.openembedded.org/openembedded-core/tree/meta/recipes-devtools/rust/rust_1.70.0.bb#n244
>
>   do_install () {
> rust_do_install
>   }
>
>   rust_do_install() {
> rust_runx install
>   }
>
>   rust_do_install:class-nativesdk() {
> export PSEUDO_UNLOAD=1
> rust_runx install
> rust_runx install clippy
> ... snip ...
>
> i'm familiar with bbclass files defining things like that; eg.,
> autotools.bbclass defining:
>
>   autotools_do_install() {
> oe_runmake 'DESTDIR=${D}' install it if it exists.
> if [ -e "${D}${infodir}/dir" ]; then
> rm -f ${D}${infodir}/dir
> fi
>   }
>
> but examples like that are generally then listed in EXPORT_FUNCTIONS
> so subsequent recipes can invoke them as part of *their* do_install(),
> like this snippet from the tar recipe:
>
>   do_install () {
> autotools_do_install
> ln -s tar ${D}${bindir}/gtar
>   }
>
> but i'm not sure why the rust recipe file is doing what it's doing.
> could it not have just defined variations of do_install() and gotten
> the same effect? or is there something more subtle happening here?
>

Inertia, I think. If you read back through the history in
oe-core/meta-rust the separation between pieces has changed over time
- probably when the .inc  was merged into the .bb I should have
refactored it as you suggest, but when the cycle time is as slow as
the rust build, trying things for the sake of it isn't fun...

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189046): 
https://lists.openembedded.org/g/openembedded-core/message/189046
Mute This Topic: https://lists.openembedded.org/mt/101936139/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] rust: reproducibility issue fix

2023-10-11 Thread Alex Kiernan

On Wed, Oct 11, 2023 at 5:06 AM Sundeep KOKKONDA via
lists.openembedded.org
 wrote:
>
> [Yocto#14875]
> The '--remap-path-prefix' option removes all references to build directory 
> structure in the debug information within the compiled output for Cargo 
> dependencies and the project's binary.
> However, some references to build directories remains in the final binary in 
> .rustc section in the form of compressed metadata and this makes the build 
> output dependent on the folder structure of the computer it's compiled on.
> So, for reproducible builds, use the configuration option 'remap-debuginfo = 
> true' along with the '--remap-path-prefix'.
>
> Signed-off-by: Sundeep KOKKONDA 
> ---
>  meta/lib/oeqa/selftest/cases/reproducible.py | 2 --
>  meta/recipes-devtools/rust/rust_1.70.0.bb| 1 +
>  2 files changed, 1 insertion(+), 2 deletions(-)
>

Blimey, well done!

-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#188954): 
https://lists.openembedded.org/g/openembedded-core/message/188954
Mute This Topic: https://lists.openembedded.org/mt/101890610/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [openembedded/openembedded-core] openssh: Move sshdgenkeys.service to sshd.socket (af38a39)

2023-09-19 Thread Alex Kiernan

Honestly I can't remember what systemd does for this... I don't run a
systemd world anywhere anymore.

On Mon, Sep 18, 2023 at 7:54 AM Pawan Badganchi  wrote:
>
> by removing the dependency, restarting the sshd service or starting it 
> manually will it generates keys?
>
>  recipes-core/openssh/files/sshd@.service
>  @@ -1,14 +1,12 @@
>  [Unit]
>  Description=OpenSSH Per-Connection Daemon
> - Wants=sshdgenkeys.service
>
>
> 
>


-- 
Alex Kiernan

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#187851): 
https://lists.openembedded.org/g/openembedded-core/message/187851
Mute This Topic: https://lists.openembedded.org/mt/101341184/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [openembedded/openembedded-core] openssh: Move sshdgenkeys.service to sshd.socket (af38a39)

2023-09-13 Thread Alex Kiernan

Pretty much what they commit says - you avoid the delay in initial connect
at the expense of more CPU up front.


On Wed, 13 Sept 2023, 08:21 pawanbadganchi, 
wrote:

> @akiernan  What problem is this commit
> supposed to solve
>
> —
> Reply to this email directly, view it on GitHub
> ,
> or unsubscribe
> 
> .
> You are receiving this because you were mentioned.Message ID:
>  @github.com>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#187612): 
https://lists.openembedded.org/g/openembedded-core/message/187612
Mute This Topic: https://lists.openembedded.org/mt/101341184/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH v2] rust: Upgrade 1.70.0 -> 1.71.0

2023-08-17 Thread Alex Kiernan

Hi

Yeah, you're correct... Currently sitting beside a pool in France,  having
discovered that the DSL where we're staying is basically useless :)

I've been buried in an ESP32 project before we went away, so not
meaningfully got back to this.

I did start looking at rebasing the patches, but there's massive churn and
my suspicion is taking the changes to parameterise the test exclusions will
be the way to go.

There biggest fix I had in the 1.71 update was to use the sysroot target
for libstd, which is a much cleaner interface.

Alex

On Thu, 17 Aug 2023, 16:15 Randy MacLeod via lists.openembedded.org,
 wrote:

> Add Alex back to the To list.
>
> On 2023-08-17 09:50, Shinde, Yash via lists.openembedded.org wrote:
>
> Alex,
>
> I will look into rust upgrade 1.70 -> 1.71. What's the timeline for this?
> I guess it's 2 weeks for feature freeze for 4.3.
>
> We talked about this offline and concluded that the best approach would be:
>
> 1. do the rebase of 1.71 but don't send to be merged. (keep it aside
> safely)
>
> 2. when 1.72 is released on August 24 2023, do that update, test and
> submit.
>
>
> Alex, I assume that you are on vacation but if you happen to read this,
> please
> do let us know if we'd be duplicating any of  your work.
>
> ../Randy
>
>
>
>
> --
> # Randy MacLeod
> # Wind River Linux
>
>
> 
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#186324): 
https://lists.openembedded.org/g/openembedded-core/message/186324
Mute This Topic: https://lists.openembedded.org/mt/100230901/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

1 2 3 4 5 6 7 >

1 - 100 of 647 matches

Mail list logo