Re: [Buildroot] [PATCH] support/download: fix cargo vendoring

["Yann E. MORIN" <yann.morin.1998@free.fr>]

Romain, All,

On 2023-01-10 13:49 +0100, Romain Naour spake thusly:
> Le 09/01/2023 à 17:30, Yann E. MORIN a écrit :
[--SNIP--]
> > Still, we keep the comment above the versions strings, in the hope that
> > a future bumper will notice and be more careful at validating the
> > vendoring.
> We have some runtime test for gitlab/github download wrapper, do we want a test
> for cargo vendor too?

Yes, that would be nice, indeed.

> Reviewed-by: Romain Naour <romain.naour@smile.fr>
> Tested-by: Romain Naour <romain.naour@smile.fr>

Typoes fixed when applying, thanks! ;-)

Regards,
Yann E. MORIN.

> Best regards,
> Romain
> 
> > 
> > Fixes:
> >     http://autobuild.buildroot.org/results/bea/beac7674bbc9fd2f8777b5861f65afee9c485753/  (bat)
> >     http://autobuild.buildroot.org/results/d1e/d1ec1ebbde115628a4b8b9099544347242a97c1c/  (dust)
> >     http://autobuild.buildroot.org/results/f96/f968be895be9ca98b314fdd688ef8d3bdf4e5dfb/  (hyerfine)
> >     http://autobuild.buildroot.org/results/a0c/a0cdb6cc9493f5248d98f98b13da854e12adc2be/  (ripgrep)
> >     ... and so many others...
> > 
> > Reported-by: Romain Naour <romain.naour@gmail.com>
> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
> > Cc: James Hilliard <james.hilliard1@gmail.com>
> > Cc: Simon Richter <simon.richter@ptwdosimetry.com>
> > ---
> >  support/download/cargo-post-process | 16 +---------------
> >  1 file changed, 1 insertion(+), 15 deletions(-)
> > 
> > diff --git a/support/download/cargo-post-process b/support/download/cargo-post-process
> > index 186e9eb69b..21a6be8dbe 100755
> > --- a/support/download/cargo-post-process
> > +++ b/support/download/cargo-post-process
> > @@ -25,25 +25,11 @@ post_process_unpack "${base_name}" "${output}"
> >  pushd "${base_name}" > /dev/null
> >  
> >  # Create the local .cargo/config with vendor info
> > -#
> > -# The first line of the output to stdout is empty.
> > -# So skip it to have the file start with the vendoring
> > -# configuration (`tail --lines=+2`).
> > -#
> > -# NOTE:
> > -#   There is  a patch for cargo to remove the first empty line:
> > -#   See: https://github.com/rust-lang/cargo/pull/11273
> > -#
> > -#   The patch already landed in +nightly and will end up
> > -#   in +stable soon.
> > -#
> > -# ->  When updating rust/cargo, the call to `tail` must be removed.
> > -#
> >  mkdir -p .cargo/
> >  cargo vendor \
> >      --manifest-path ${BR_CARGO_MANIFEST_PATH-Cargo.toml} \
> >      --locked VENDOR \
> > -    | tail --lines=+2 | tee .cargo/config
> > +    | tee .cargo/config
> >  
> >  popd > /dev/null
> >  
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot