| Message ID | 20240311162419.1138625-10-jose.quaresma@foundries.io |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-lts-mixins,kirkstone/rust,01/11] rust: Fetch cargo from rust-snapshot dir. | expand |
Hi Sundeep, Sundeep KOKKONDA <Sundeep.Kokkonda@windriver.com> escreveu (terça, 12/03/2024 à(s) 03:45): > Hello, > > FYI. There is a V2 available for this patch with upstream fix backport. > You can consider that. > > https://lists.openembedded.org/g/openembedded-core/message/196856 Sure, when this one is integrated on the master branch I can create a backport for it too. Thanks for the notification. Jose > > > > Thanks, > > Sundeep K. > > On 11-Mar-24 21:54, Jose Quaresma wrote: > > 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. > > > > From: Yash Shinde <Yash.Shinde@windriver.com> > > > > With 1.75 rust release, the '.rustc' section of shared object libs are > embedded with absolute path names which is casuing reproducibiluty issues. > > This change will fix the path name format back to '/rust/$hash' as in > earlier versions. > > > > Below are the links for detailed bug description & discusssion with > upstream rust. > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > > > Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > --- > > .../files/repro-issue-fix-with-v175.patch | 23 +++++++++++++++++++ > > recipes-devtools/rust/rust-source.inc | 1 + > > 2 files changed, 24 insertions(+) > > create mode 100644 > recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > diff --git a/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > new file mode 100644 > > index 0000000..6840baf > > --- /dev/null > > +++ b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > @@ -0,0 +1,23 @@ > > +rust: reproducibility issue fix with v1.75 > > + > > +With 1.75 rust release, the '.rustc' section of shared object libs are > embedded with absolute path names which is casuing reproducibiluty issues. > > +This change will fix the path name format back to '/rust/$hash' as in > earlier versions. > > + > > +Below are the links for detailed bug description & discusssion with > upstream rust. > > +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > + > > +Upstream-Status: Inappropriate [patches need rework] > > +Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > +--- > > +--- a/compiler/rustc_session/src/session.rs 2023-12-21 > 08:55:28.000000000 -0800 > > ++++ b/compiler/rustc_session/src/session.rs 2024-02-26 > 07:29:15.527577022 -0800 > > +@@ -1269,7 +1269,7 @@ > > + | CrateType::Rlib > > + | CrateType::Staticlib > > + | CrateType::Cdylib => continue, > > +- CrateType::ProcMacro => return false, > > ++ CrateType::ProcMacro => return true, > > + } > > + } > > + > > diff --git a/recipes-devtools/rust/rust-source.inc > b/recipes-devtools/rust/rust-source.inc > > index 8ae8add..6bef990 100644 > > --- a/recipes-devtools/rust/rust-source.inc > > +++ b/recipes-devtools/rust/rust-source.inc > > @@ -12,6 +12,7 @@ SRC_URI += " > https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n > > file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ > > file://target-build-value.patch;patchdir=${RUSTSRC} \ > > > file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} > \ > > + file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ > > " > > SRC_URI[rust.sha256sum] = > "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" > > > > -- > > 2.44.0 > > >
On Tue, 12 Mar 2024, Jose Quaresma wrote: > Hi Sundeep, > > Sundeep KOKKONDA <Sundeep.Kokkonda@windriver.com> escreveu (terça, > 12/03/2024 à(s) 03:45): > > > Hello, > > > > FYI. There is a V2 available for this patch with upstream fix backport. > > You can consider that. > > > > https://lists.openembedded.org/g/openembedded-core/message/196856 > > > Sure, when this one is integrated on the master branch I can create a > backport for it too. > Thanks for the notification. I got back from a couple of weeks out of the office (conference followed by vacation) yesterday, I aim to test the patch series locally and merge it to kirkstone/rust in the next couple of days. We now seem to need newer than Rust 1.70 for a recipe in AGL, so I'll likely be switching AGL to using kirkstone/rust as well. Thanks, Scott > > On 11-Mar-24 21:54, Jose Quaresma wrote: > > > 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. > > > > > > From: Yash Shinde <Yash.Shinde@windriver.com> > > > > > > With 1.75 rust release, the '.rustc' section of shared object libs are > > embedded with absolute path names which is casuing reproducibiluty issues. > > > This change will fix the path name format back to '/rust/$hash' as in > > earlier versions. > > > > > > Below are the links for detailed bug description & discusssion with > > upstream rust. > > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > > > > > Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > > Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> > > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > > --- > > > .../files/repro-issue-fix-with-v175.patch | 23 +++++++++++++++++++ > > > recipes-devtools/rust/rust-source.inc | 1 + > > > 2 files changed, 24 insertions(+) > > > create mode 100644 > > recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > > > diff --git a/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > new file mode 100644 > > > index 0000000..6840baf > > > --- /dev/null > > > +++ b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > @@ -0,0 +1,23 @@ > > > +rust: reproducibility issue fix with v1.75 > > > + > > > +With 1.75 rust release, the '.rustc' section of shared object libs are > > embedded with absolute path names which is casuing reproducibiluty issues. > > > +This change will fix the path name format back to '/rust/$hash' as in > > earlier versions. > > > + > > > +Below are the links for detailed bug description & discusssion with > > upstream rust. > > > +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > > +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > > + > > > +Upstream-Status: Inappropriate [patches need rework] > > > +Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > > +--- > > > +--- a/compiler/rustc_session/src/session.rs 2023-12-21 > > 08:55:28.000000000 -0800 > > > ++++ b/compiler/rustc_session/src/session.rs 2024-02-26 > > 07:29:15.527577022 -0800 > > > +@@ -1269,7 +1269,7 @@ > > > + | CrateType::Rlib > > > + | CrateType::Staticlib > > > + | CrateType::Cdylib => continue, > > > +- CrateType::ProcMacro => return false, > > > ++ CrateType::ProcMacro => return true, > > > + } > > > + } > > > + > > > diff --git a/recipes-devtools/rust/rust-source.inc > > b/recipes-devtools/rust/rust-source.inc > > > index 8ae8add..6bef990 100644 > > > --- a/recipes-devtools/rust/rust-source.inc > > > +++ b/recipes-devtools/rust/rust-source.inc > > > @@ -12,6 +12,7 @@ SRC_URI += " > > https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n > > > file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ > > > file://target-build-value.patch;patchdir=${RUSTSRC} \ > > > > > file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} > > \ > > > + file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ > > > " > > > SRC_URI[rust.sha256sum] = > > "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" > > > > > > -- > > > 2.44.0 > > > > > > > >
On Tue, 12 Mar 2024, Scott Murray wrote: > On Tue, 12 Mar 2024, Jose Quaresma wrote: > > > Hi Sundeep, > > > > Sundeep KOKKONDA <Sundeep.Kokkonda@windriver.com> escreveu (terça, > > 12/03/2024 à(s) 03:45): > > > > > Hello, > > > > > > FYI. There is a V2 available for this patch with upstream fix backport. > > > You can consider that. > > > > > > https://lists.openembedded.org/g/openembedded-core/message/196856 > > > > > > Sure, when this one is integrated on the master branch I can create a > > backport for it too. > > Thanks for the notification. > > I got back from a couple of weeks out of the office (conference followed > by vacation) yesterday, I aim to test the patch series locally and merge > it to kirkstone/rust in the next couple of days. We now seem to need > newer than Rust 1.70 for a recipe in AGL, so I'll likely be switching AGL > to using kirkstone/rust as well. I have merged the current patch series to kirkstone/rust with a minor tweak to update the layer.conf RUSTVERSION over-ride to match 1.75, and adding pointers to the original oe-core commits in the commit messages. Thanks, Scott > > > On 11-Mar-24 21:54, Jose Quaresma wrote: > > > > 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. > > > > > > > > From: Yash Shinde <Yash.Shinde@windriver.com> > > > > > > > > With 1.75 rust release, the '.rustc' section of shared object libs are > > > embedded with absolute path names which is casuing reproducibiluty issues. > > > > This change will fix the path name format back to '/rust/$hash' as in > > > earlier versions. > > > > > > > > Below are the links for detailed bug description & discusssion with > > > upstream rust. > > > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > > > > > > > Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > > > Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> > > > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > > > --- > > > > .../files/repro-issue-fix-with-v175.patch | 23 +++++++++++++++++++ > > > > recipes-devtools/rust/rust-source.inc | 1 + > > > > 2 files changed, 24 insertions(+) > > > > create mode 100644 > > > recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > > > > > diff --git a/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > new file mode 100644 > > > > index 0000000..6840baf > > > > --- /dev/null > > > > +++ b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > @@ -0,0 +1,23 @@ > > > > +rust: reproducibility issue fix with v1.75 > > > > + > > > > +With 1.75 rust release, the '.rustc' section of shared object libs are > > > embedded with absolute path names which is casuing reproducibiluty issues. > > > > +This change will fix the path name format back to '/rust/$hash' as in > > > earlier versions. > > > > + > > > > +Below are the links for detailed bug description & discusssion with > > > upstream rust. > > > > +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > > > +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > > > + > > > > +Upstream-Status: Inappropriate [patches need rework] > > > > +Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > > > +--- > > > > +--- a/compiler/rustc_session/src/session.rs 2023-12-21 > > > 08:55:28.000000000 -0800 > > > > ++++ b/compiler/rustc_session/src/session.rs 2024-02-26 > > > 07:29:15.527577022 -0800 > > > > +@@ -1269,7 +1269,7 @@ > > > > + | CrateType::Rlib > > > > + | CrateType::Staticlib > > > > + | CrateType::Cdylib => continue, > > > > +- CrateType::ProcMacro => return false, > > > > ++ CrateType::ProcMacro => return true, > > > > + } > > > > + } > > > > + > > > > diff --git a/recipes-devtools/rust/rust-source.inc > > > b/recipes-devtools/rust/rust-source.inc > > > > index 8ae8add..6bef990 100644 > > > > --- a/recipes-devtools/rust/rust-source.inc > > > > +++ b/recipes-devtools/rust/rust-source.inc > > > > @@ -12,6 +12,7 @@ SRC_URI += " > > > https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n > > > > file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ > > > > file://target-build-value.patch;patchdir=${RUSTSRC} \ > > > > > > > file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} > > > \ > > > > + file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ > > > > " > > > > SRC_URI[rust.sha256sum] = > > > "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" > > > > > > > > -- > > > > 2.44.0 > > > > > > > > > > > > >
Thanks for the update. Jose Scott Murray <scott.murray@konsulko.com> escreveu (segunda, 18/03/2024 à(s) 00:10): > On Tue, 12 Mar 2024, Scott Murray wrote: > > > On Tue, 12 Mar 2024, Jose Quaresma wrote: > > > > > Hi Sundeep, > > > > > > Sundeep KOKKONDA <Sundeep.Kokkonda@windriver.com> escreveu (terça, > > > 12/03/2024 à(s) 03:45): > > > > > > > Hello, > > > > > > > > FYI. There is a V2 available for this patch with upstream fix > backport. > > > > You can consider that. > > > > > > > > https://lists.openembedded.org/g/openembedded-core/message/196856 > > > > > > > > > Sure, when this one is integrated on the master branch I can create a > > > backport for it too. > > > Thanks for the notification. > > > > I got back from a couple of weeks out of the office (conference followed > > by vacation) yesterday, I aim to test the patch series locally and merge > > it to kirkstone/rust in the next couple of days. We now seem to need > > newer than Rust 1.70 for a recipe in AGL, so I'll likely be switching AGL > > to using kirkstone/rust as well. > > I have merged the current patch series to kirkstone/rust with a minor > tweak to update the layer.conf RUSTVERSION over-ride to match 1.75, and > adding pointers to the original oe-core commits in the commit messages. > > Thanks, > > Scott > > > > > > On 11-Mar-24 21:54, Jose Quaresma wrote: > > > > > 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. > > > > > > > > > > From: Yash Shinde <Yash.Shinde@windriver.com> > > > > > > > > > > With 1.75 rust release, the '.rustc' section of shared object libs > are > > > > embedded with absolute path names which is casuing reproducibiluty > issues. > > > > > This change will fix the path name format back to '/rust/$hash' as > in > > > > earlier versions. > > > > > > > > > > Below are the links for detailed bug description & discusssion with > > > > upstream rust. > > > > > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > > > > > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > > > > > > > > > Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > > > > Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com> > > > > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > > > > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> > > > > > --- > > > > > .../files/repro-issue-fix-with-v175.patch | 23 > +++++++++++++++++++ > > > > > recipes-devtools/rust/rust-source.inc | 1 + > > > > > 2 files changed, 24 insertions(+) > > > > > create mode 100644 > > > > recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > > > > > > > diff --git > a/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > > new file mode 100644 > > > > > index 0000000..6840baf > > > > > --- /dev/null > > > > > +++ b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch > > > > > @@ -0,0 +1,23 @@ > > > > > +rust: reproducibility issue fix with v1.75 > > > > > + > > > > > +With 1.75 rust release, the '.rustc' section of shared object > libs are > > > > embedded with absolute path names which is casuing reproducibiluty > issues. > > > > > +This change will fix the path name format back to '/rust/$hash' > as in > > > > earlier versions. > > > > > + > > > > > +Below are the links for detailed bug description & discusssion > with > > > > upstream rust. > > > > > + > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 > > > > > + > https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 > > > > > + > > > > > +Upstream-Status: Inappropriate [patches need rework] > > > > > +Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> > > > > > +--- > > > > > +--- a/compiler/rustc_session/src/session.rs 2023-12-21 > > > > 08:55:28.000000000 -0800 > > > > > ++++ b/compiler/rustc_session/src/session.rs 2024-02-26 > > > > 07:29:15.527577022 -0800 > > > > > +@@ -1269,7 +1269,7 @@ > > > > > + | CrateType::Rlib > > > > > + | CrateType::Staticlib > > > > > + | CrateType::Cdylib => continue, > > > > > +- CrateType::ProcMacro => return false, > > > > > ++ CrateType::ProcMacro => return true, > > > > > + } > > > > > + } > > > > > + > > > > > diff --git a/recipes-devtools/rust/rust-source.inc > > > > b/recipes-devtools/rust/rust-source.inc > > > > > index 8ae8add..6bef990 100644 > > > > > --- a/recipes-devtools/rust/rust-source.inc > > > > > +++ b/recipes-devtools/rust/rust-source.inc > > > > > @@ -12,6 +12,7 @@ SRC_URI += " > > > > https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n > > > > > file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ > > > > > file://target-build-value.patch;patchdir=${RUSTSRC} \ > > > > > > > > > > file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} > > > > \ > > > > > + > file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ > > > > > " > > > > > SRC_URI[rust.sha256sum] = > > > > "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340" > > > > > > > > > > -- > > > > > 2.44.0 > > > > > > > > > > > > > > > > > >
diff --git a/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch new file mode 100644 index 0000000..6840baf --- /dev/null +++ b/recipes-devtools/rust/files/repro-issue-fix-with-v175.patch @@ -0,0 +1,23 @@ +rust: reproducibility issue fix with v1.75 + +With 1.75 rust release, the '.rustc' section of shared object libs are embedded with absolute path names which is casuing reproducibiluty issues. +This change will fix the path name format back to '/rust/$hash' as in earlier versions. + +Below are the links for detailed bug description & discusssion with upstream rust. +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964307219 +https://github.com/rust-lang/rust/issues/120825#issuecomment-1964652656 + +Upstream-Status: Inappropriate [patches need rework] +Signed-off-by: Sundeep KOKKONDA <sundeep.kokkonda@windriver.com> +--- +--- a/compiler/rustc_session/src/session.rs 2023-12-21 08:55:28.000000000 -0800 ++++ b/compiler/rustc_session/src/session.rs 2024-02-26 07:29:15.527577022 -0800 +@@ -1269,7 +1269,7 @@ + | CrateType::Rlib + | CrateType::Staticlib + | CrateType::Cdylib => continue, +- CrateType::ProcMacro => return false, ++ CrateType::ProcMacro => return true, + } + } + diff --git a/recipes-devtools/rust/rust-source.inc b/recipes-devtools/rust/rust-source.inc index 8ae8add..6bef990 100644 --- a/recipes-devtools/rust/rust-source.inc +++ b/recipes-devtools/rust/rust-source.inc @@ -12,6 +12,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://rustc-bootstrap.patch;patchdir=${RUSTSRC} \ file://target-build-value.patch;patchdir=${RUSTSRC} \ file://0001-Handle-vendored-sources-when-remapping-paths.patch;patchdir=${RUSTSRC} \ + file://repro-issue-fix-with-v175.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "4526f786d673e4859ff2afa0bab2ba13c918b796519a25c1acce06dba9542340"