Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1
@ 2023-12-28 15:26 Antoine Coutant
  2023-12-28 15:26 ` [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3 Antoine Coutant
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: Antoine Coutant @ 2023-12-28 15:26 UTC (permalink / raw)
  To: buildroot; +Cc: Antoine Coutant, romain.naour, sebastian.weyer

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

The mips*-unknown-linux-gnu* targets were removed from
stage 2 with host tools in version 1.72.0.
Release note:
https://github.com/rust-lang/rust/releases/tag/1.72.0

Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
---
Tested with ripgrep using qemu_aarch64_virt_defconfig.
---
 package/rust-bin/rust-bin.hash | 236 +++++++++++++++------------------
 package/rust-bin/rust-bin.mk   |   2 +-
 package/rust/rust.hash         |   6 +-
 package/rust/rust.mk           |   2 +-
 package/rustc/Config.in.host   |  10 --
 5 files changed, 114 insertions(+), 142 deletions(-)

diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash
index a11a964a90..d44cb2cb67 100644
--- a/package/rust-bin/rust-bin.hash
+++ b/package/rust-bin/rust-bin.hash
@@ -1,129 +1,111 @@
-# From https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz.asc
-sha256  911f2370b67b066cefd2ee772c5219015817e2c2dc327351f8b00c5ca7a1098f  rust-1.71.1-aarch64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-i686-unknown-linux-gnu.tar.xz.asc
-sha256  c8ec5dcb8f59276d46360ed832fb428d212985fd5b2b0591e6f70a279d10274f  rust-1.71.1-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-mips-unknown-linux-gnu.tar.xz.asc
-sha256  64f3189a2c55a8c7323e344c891d07637448454a10fed6dad5f7744f25abea94  rust-1.71.1-mips-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz.asc
-sha256  8f35174620db211a99743660c7eddff1b41ad2d4c80787d4e6c808d548bdf3b7  rust-1.71.1-mipsel-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz.asc
-sha256  ec14ef19f8929029435f5c0f9ee1c92534454e03369767968c0353fcd7b41791  rust-1.71.1-powerpc-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.asc
-sha256  a03ad9d193960a2303269d98cd99f9f27990eb3874e76396282a49347c048085  rust-1.71.1-powerpc64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.asc
-sha256  be14d5e2978f72e2607d7d6611f7e4066e772a46e0effa97862a60ee51f9afa8  rust-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.asc
-sha256  b2a0562d547a48ed6279a1594ca2a489ee34c08dc4181b1117b900bc2f4ccfc9  rust-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-s390x-unknown-linux-gnu.tar.xz.asc
-sha256  ba282d429013028c45ea14ea4d909c3a1bb5ef2f57bca1dda7b436216554977d  rust-1.71.1-s390x-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz.asc
-sha256  ee205c9ee095ee5a9382332422b0be2bd2737451c6dd6e24cb2a28cec16b97ac  rust-1.71.1-x86_64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-gnu.tar.xz.asc
-sha256  232afbb1b8673694742eba6444ee7c70294ca6da285cdeef9d43acd3f4c58ddc  rust-std-1.71.1-aarch64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-musl.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-aarch64-unknown-linux-musl.tar.xz.asc
-sha256  347af135014822d0f191241457ee1fba28ee85285bc26881c5137989fcb0fa53  rust-std-1.71.1-aarch64-unknown-linux-musl.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabi.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabi.tar.xz.asc
-sha256  68c51ede38dc74e6adac606ddba7d688b4f5f9df058e922916af73cd59b17379  rust-std-1.71.1-arm-unknown-linux-gnueabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabihf.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-gnueabihf.tar.xz.asc
-sha256  4720dee4efe1cbcf7c21ba3a5806dbfb6f7f04e67dec1a79c3fd61d5fd2deea3  rust-std-1.71.1-arm-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabihf.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabihf.tar.xz.asc
-sha256  d1746b00db5d0ad09749e5a93740830a2850bcbd726b2e96d44fff06a2c72f6c  rust-std-1.71.1-arm-unknown-linux-musleabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabi.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-arm-unknown-linux-musleabi.tar.xz.asc
-sha256  21533a39478f7484e22d733154405dca2842e2ad0f38cb1f53d6edbe85bb6e2d  rust-std-1.71.1-arm-unknown-linux-musleabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-gnueabi.tar.xz.asc
-sha256  9a5b0aa20ab0f1951af9ba79df9e28d2cd57612f1d309e8210d2c24334d8332f  rust-std-1.71.1-armv5te-unknown-linux-gnueabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-musleabi.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv5te-unknown-linux-musleabi.tar.xz.asc
-sha256  aa8dbaf140b357c392ea2364b2d22a735900ca2d0d6e609c85b94666725c4999  rust-std-1.71.1-armv5te-unknown-linux-musleabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz.asc
-sha256  7f3816824948a017135d5c58aeb97df962f2e60575a18f18967eb473e68c7cdc  rust-std-1.71.1-armv7-unknown-linux-gnueabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabi.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-gnueabi.tar.xz.asc
-sha256  030a8ad8e5b794c5ca265a8837c46da442acae7c1ad2c4dfb61e9f751ddcfa1e  rust-std-1.71.1-armv7-unknown-linux-gnueabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabihf.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabihf.tar.xz.asc
-sha256  66a7c87d9a78fa4799eea5c73d885c4e6da17608d1f8e13823b298d82310ccca  rust-std-1.71.1-armv7-unknown-linux-musleabihf.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabi.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-armv7-unknown-linux-musleabi.tar.xz.asc
-sha256  afb5e6f523ec8b0ffc033942af53c4f60e564122f85af4e405b4c4ef7643f182  rust-std-1.71.1-armv7-unknown-linux-musleabi.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-gnu.tar.xz.asc
-sha256  a8bead93f5260c81f7a6795a29e8365ac30b966e7808c4957a4bd37843ab4e80  rust-std-1.71.1-i586-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-musl.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i586-unknown-linux-musl.tar.xz.asc
-sha256  7314624674c9817de083c0e88ea8650d839273a55f03de2e6f037ba64309d477  rust-std-1.71.1-i586-unknown-linux-musl.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-gnu.tar.xz.asc
-sha256  672811c88fd5ffc5185d40eeecc7d257aeff47c9b48e0ced70ccea1e2559b273  rust-std-1.71.1-i686-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-musl.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-i686-unknown-linux-musl.tar.xz.asc
-sha256  5d214864c9c62ea65e460e75ea65e2313b5b68a9db11f1c30edf271c8b041097  rust-std-1.71.1-i686-unknown-linux-musl.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-gnu.tar.xz.asc
-sha256  e4348549904d9fff3f4d5608464d463815b8f47a3361927cf87458b4daf6b093  rust-std-1.71.1-mips-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-musl.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips-unknown-linux-musl.tar.xz.asc
-sha256  e9d3caf95d111029f6a882ed2ca322a7d2c182e4c094a1f383725ae1aa980707  rust-std-1.71.1-mips-unknown-linux-musl.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz.asc
-sha256  c3185d57e96832d1a6c5e48e83e75698a46a49675432a367ecd0701c481d1280  rust-std-1.71.1-mips64-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-muslabi64.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64-unknown-linux-muslabi64.tar.xz.asc
-sha256  6f5549ff40278b8baa84c203730d348fff94aef20372c28fd373bc55acf99a3e  rust-std-1.71.1-mips64-unknown-linux-muslabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc
-sha256  c6cf211aa291e09115fb08a96070deb1c9b292ef21e4263ee80e168eb66c675f  rust-std-1.71.1-mips64el-unknown-linux-gnuabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mips64el-unknown-linux-muslabi64.tar.xz.asc
-sha256  9cd1a7b2364d6af230e96700bd6b631b7f8dcfc3bad0feffefdf9ca6ce1df79c  rust-std-1.71.1-mips64el-unknown-linux-muslabi64.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-gnu.tar.xz.asc
-sha256  05eb744705ac17a1b21693891219051ffbec05f2bc2be84f1eb4c5d1573f1b15  rust-std-1.71.1-mipsel-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-musl.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-mipsel-unknown-linux-musl.tar.xz.asc
-sha256  4fb95536ff01b04f57cd14eebb57043e7d420aabce4b0b5beb3133f3a9844fa4  rust-std-1.71.1-mipsel-unknown-linux-musl.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc-unknown-linux-gnu.tar.xz.asc
-sha256  8a5e93d9a106c90d658b88c8ded15b8d2446d3d6316f5d477b3b259b62119d7c  rust-std-1.71.1-powerpc-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64-unknown-linux-gnu.tar.xz.asc
-sha256  73d80d654f0b04a7b05168d08322ea9e4cc3bceeb8546cad5f398f8bbdeeddf5  rust-std-1.71.1-powerpc64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz.asc
-sha256  949c3d340674aac746a0278bb90707b179b95afe37200a61f05c56e8bdfc9060  rust-std-1.71.1-powerpc64le-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz.asc
-sha256  dd8399582595bc449aee5c7c7fb5d8061338be36583404a82e2d9e5b20743dae  rust-std-1.71.1-riscv64gc-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-s390x-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-s390x-unknown-linux-gnu.tar.xz.asc
-sha256  60275c7d1a36abec87bf6e151d908a04e5cd28d22215fe0098caa4342f1c30d0  rust-std-1.71.1-s390x-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-sparc64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-sparc64-unknown-linux-gnu.tar.xz.asc
-sha256  92e46ba59c0f402691a810a6b57136ebccbcfab4beefb0ccfca55e3fb288180d  rust-std-1.71.1-sparc64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-gnu.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-gnu.tar.xz.asc
-sha256  31f392df564850d78be80adc625b06a3964a49ef5c519075b930f2042a422264  rust-std-1.71.1-x86_64-unknown-linux-gnu.tar.xz
-# From https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-musl.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rust-std-1.71.1-x86_64-unknown-linux-musl.tar.xz.asc
-sha256  20667738a9005dda0386c8b6e59d55ce3044be11f78002f6640ca874d6911483  rust-std-1.71.1-x86_64-unknown-linux-musl.tar.xz
-# Locally generated
+# From https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc
+sha256  88d0cd0407ca5bb73b5d72956d85e31e057657c7ec09a58ca634cf36bd5cf626  rust-1.74.1-aarch64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-i686-unknown-linux-gnu.tar.xz.asc
+sha256  f58cdf15717e7f6506088e753ffef3ec655a4ccd932eae280d6cb68b0ee3feca  rust-1.74.1-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc
+sha256  d272cec30f3461647861d120af53946142fa2f969f43040c2685425cb67c7d79  rust-1.74.1-powerpc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc
+sha256  17df1fa64083fa508576062a651577e0741d02f4ae5771518a72fd4ea483b00f  rust-1.74.1-powerpc64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc
+sha256  054a98e8e85e94c187ff8bc16bac8011747839c9ad73584fdd87b904f137eb23  rust-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc
+sha256  4abc1499e91cfadf7610a08271d1f5ff9284a54ba4a0ba60f105bb9b2413169e  rust-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc
+sha256  3196fd6e4453cd2191e5f8c4f63eaffd045cc1884cf4b64d94990aa81232f85f  rust-1.74.1-s390x-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc
+sha256  5483e32fe962e9123cf49c9cf169e60640d4c9d0aad1a054dd4bf232f0f012be  rust-1.74.1-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz.asc
+sha256  a776e7b41991ef7a50706d1f9b7752a8d963e67297bfc22471d6e68d544349cc  rust-std-1.74.1-aarch64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz.asc
+sha256  d712e44d57f3732c294affb26c07d8fb79f25c716b16a4bde910390f34cc9959  rust-std-1.74.1-aarch64-unknown-linux-musl.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz.asc
+sha256  38ccd7eeb30e481a27533ec1450c1eb4f3c3fee284f702ee64676b3831bde425  rust-std-1.74.1-arm-unknown-linux-gnueabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz.asc
+sha256  5f1b890faa083afd97ed53c67d859f4de89abe9a059b48c98217d8ee015bedeb  rust-std-1.74.1-arm-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz.asc
+sha256  9b57973a9d23e713799169c3b39282655b742c9182e21270f53a3bb46af516f3  rust-std-1.74.1-arm-unknown-linux-musleabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz.asc
+sha256  26bad270c96de6ca0abbad4a2be63f994fede26b19cfab3362479668f3d1d5c5  rust-std-1.74.1-arm-unknown-linux-musleabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz.asc
+sha256  c567bf8e062daead8a256ee3097e724e1f70a4be5f69a74c3722719fb338af27  rust-std-1.74.1-armv5te-unknown-linux-gnueabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz.asc
+sha256  96c81d327c4cd5cd35541dae3db4ed6eef6a943c78b0595396e88264a692b5e2  rust-std-1.74.1-armv5te-unknown-linux-musleabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz.asc
+sha256  339b4bf274ba569245a3e7bc1c9e238ce64c1942c5510fb19a4cacae37aa8aa9  rust-std-1.74.1-armv7-unknown-linux-gnueabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz.asc
+sha256  915c3648772d1b00b491a204239362aac33b213e95ac7e818b2001a40aae800a  rust-std-1.74.1-armv7-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz.asc
+sha256  e0a61bd2f33e5929a47654dccc5387c56aa847ab028ff2f1992b4dc82da677f0  rust-std-1.74.1-armv7-unknown-linux-musleabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz.asc
+sha256  7402c633f1a765053ca9bd4c03d65ece67651af9ce3698781a8d2a271e76cbaa  rust-std-1.74.1-armv7-unknown-linux-musleabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz.asc
+sha256  7c01117e7db5b77880d2ed5f3874ae10cdf9a3d2d042fc06011a8f5f8346b66c  rust-std-1.74.1-i586-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i586-unknown-linux-musl.tar.xz.asc
+sha256  b2781008ab93083970d5bf18782f6611f80d5b2a0aa1eaf6e6a44e8b0c146d9b  rust-std-1.74.1-i586-unknown-linux-musl.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz.asc
+sha256  de7bfa755339d81d0f375c04a6b5432fba8452fdc72154fbe5cd5e1147902b90  rust-std-1.74.1-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-i686-unknown-linux-musl.tar.xz.asc
+sha256  1d0a2aa7fc04896bb73d08ec6b7247d9f8e2db46532c31adff3d7944d66dfb4b  rust-std-1.74.1-i686-unknown-linux-musl.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips-unknown-linux-musl.tar.xz.asc
+sha256  c1721bb1f47941b1e6acc2f91b326d9172bf401dd88e92abacbb8084ecbc568f  rust-std-1.74.1-mips-unknown-linux-musl.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz.asc
+sha256  d2680c31aabfa896301689a0a03206aad31a59111a3c041c357ba5508f56dcfc  rust-std-1.74.1-mips64-unknown-linux-muslabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz.asc
+sha256  7a8b6f7cc454efb57f575ba50956f2530e192ab50c622acf38b29a42a5bb31e0  rust-std-1.74.1-mips64el-unknown-linux-muslabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz.asc
+sha256  733995dec75a90d4039bc3a6e11c44e256bfc4cb074e46a67e2aebfe1ec69a26  rust-std-1.74.1-mipsel-unknown-linux-musl.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz.asc
+sha256  7fb458560bccae13f6558df43d5e17f177a084fdcb605d500eda63bc1ac3eb58  rust-std-1.74.1-powerpc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz.asc
+sha256  931f975a4a4c8dc17552d965b276c7211e25f8c5deec1f41f5db5c181fa15320  rust-std-1.74.1-powerpc64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz.asc
+sha256  40781d07bb9a23d57c2440d70fee6385d8d40553b739d835c38fd0abe96d7ec5  rust-std-1.74.1-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz.asc
+sha256  2c4de6689f5008289b791ad15b8cdc2d69947985b81b77d4dbe5d31632532e1d  rust-std-1.74.1-riscv64gc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz.asc
+sha256  781403a12fef605250869aeb843be6b7f98ed6c0a62f0349fda53ee4d9d8e296  rust-std-1.74.1-s390x-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz.asc
+sha256  e19c0d79b385454a8e8c9f27c3ca9779ffac778d8b7cd8de701ce413f492d9f1  rust-std-1.74.1-sparc64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz.asc
+sha256  df435e3254c03ccbfc9e733ae33b399f5f99bd488974bc07d8b1db91a12ee95b  rust-std-1.74.1-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz.asc
+sha256  98f190039c7e7922838f9716443b7ddfec2aa3dc229f5b1813a26591c557997e  rust-std-1.74.1-x86_64-unknown-linux-musl.tar.xz
+# Locally  generated
 sha256  62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a  LICENSE-APACHE
 sha256  23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk
index db31e26a70..ca35d27d1c 100644
--- a/package/rust-bin/rust-bin.mk
+++ b/package/rust-bin/rust-bin.mk
@@ -6,7 +6,7 @@
 
 # When updating this version, check whether support/download/cargo-post-process
 # still generates the same archives.
-RUST_BIN_VERSION = 1.71.1
+RUST_BIN_VERSION = 1.74.1
 RUST_BIN_SITE = https://static.rust-lang.org/dist
 RUST_BIN_LICENSE = Apache-2.0 or MIT
 RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
diff --git a/package/rust/rust.hash b/package/rust/rust.hash
index 59270e1957..175fa71baf 100644
--- a/package/rust/rust.hash
+++ b/package/rust/rust.hash
@@ -1,6 +1,6 @@
-# From https://static.rust-lang.org/dist/rustc-1.71.1-src.tar.xz.sha256
-# Verified using https://static.rust-lang.org/dist/rustc-1.71.1-src.tar.xz.asc
-sha256  371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1  rustc-1.71.1-src.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.sha256
+# Verified using https://static.rust-lang.org/dist/rustc-1.74.1-src.tar.xz.asc
+sha256  b98c09d968529212fb29eec7d6d3e9bdaa869810679b7fb86a1ca69469d75f5e  rustc-1.74.1-src.tar.xz
 # Locally generated
 sha256  62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a  LICENSE-APACHE
 sha256  23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
diff --git a/package/rust/rust.mk b/package/rust/rust.mk
index a55bc447f4..f7a5c0fcd5 100644
--- a/package/rust/rust.mk
+++ b/package/rust/rust.mk
@@ -6,7 +6,7 @@
 
 # When updating this version, check whether support/download/cargo-post-process
 # still generates the same archives.
-RUST_VERSION = 1.71.1
+RUST_VERSION = 1.74.1
 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz
 RUST_SITE = https://static.rust-lang.org/dist
 RUST_LICENSE = Apache-2.0 or MIT
diff --git a/package/rustc/Config.in.host b/package/rustc/Config.in.host
index 822de68dbb..6beaad0425 100644
--- a/package/rustc/Config.in.host
+++ b/package/rustc/Config.in.host
@@ -2,8 +2,6 @@
 config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
 	bool
 	default y if BR2_HOSTARCH = "aarch64"
-	default y if BR2_HOSTARCH = "mips"
-	default y if BR2_HOSTARCH = "mipsel"
 	default y if BR2_HOSTARCH = "powerpc"
 	default y if BR2_HOSTARCH = "powerpc64"
 	default y if BR2_HOSTARCH = "powerpc64le"
@@ -45,14 +43,6 @@ config BR2_PACKAGE_HOST_RUSTC_TARGET_TIER2_HOST_TOOLS_PLATFORMS
 	# armv7-unknown-linux-gnueabihf for armv8 hardware with 32-bit
 	# userspace
 	default y if BR2_arm && BR2_ARM_CPU_ARMV8A && BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC
-	# mips-unknown-linux-gnu
-	default y if BR2_mips && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6
-	# mips64-unknown-linux-gnuabi64
-	default y if BR2_mips64 && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6
-	# mipsel-unknown-linux-gnu
-	default y if BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC && !BR2_MIPS_CPU_MIPS32R6
-	# mips64el-unknown-linux-gnuabi64
-	default y if BR2_mips64el && BR2_TOOLCHAIN_USES_GLIBC && BR2_MIPS_NABI64 && !BR2_MIPS_CPU_MIPS64R6
 	# powerpc-unknown-linux-gnu
 	default y if BR2_powerpc && BR2_TOOLCHAIN_USES_GLIBC
 	# powerpc64-unknown-linux-gnu
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-28 15:26 [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1 Antoine Coutant
@ 2023-12-28 15:26 ` Antoine Coutant
  2023-12-29 22:13   ` Yann E. MORIN
  2023-12-31 14:36   ` Yann E. MORIN
  2023-12-28 15:26 ` [Buildroot] [PATCH v2 3/3] support/testing: test_rust.py: Add test to check correct vendoring Antoine Coutant
  2023-12-30 18:01 ` [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1 Thomas Petazzoni via buildroot
  2 siblings, 2 replies; 15+ messages in thread
From: Antoine Coutant @ 2023-12-28 15:26 UTC (permalink / raw)
  To: buildroot; +Cc: Antoine Coutant, romain.naour, sebastian.weyer

ripgrep previous version hash is no longer valid.
The tarball is modified by rust vendoring so the hash
may change with rust versions.

The patch has been rebased to ripgrep 14.0.3.

Changelog:
https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md

Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
---

Tested using qemu_aarch64_virt_defconfig and Arm AArch64 13.2.rel1
toolchain.

Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
---
 ...llocator-behind-a-cargo-feature-flag.patch | 52 ++++++++++---------
 package/ripgrep/ripgrep.hash                  |  2 +-
 package/ripgrep/ripgrep.mk                    |  6 +--
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
index e2ba68f389..aa073c6e7f 100644
--- a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
+++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
@@ -1,4 +1,4 @@
-From 68c2a4d7a5d9b46f65121958fdb12d5270bfd1b6 Mon Sep 17 00:00:00 2001
+From e4df6678e3e2d018acccafd47d1e484887d23323 Mon Sep 17 00:00:00 2001
 From: Jonathan Stites <mail@jonstites.com>
 Date: Wed, 6 May 2020 12:55:35 +0000
 Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag
@@ -9,6 +9,8 @@ Moves jemalloc behind a feature for musl builds, where it is not
 supported by the upstream project, so ripgrep will fail to build.
 
 Signed-off-by: Sam Voss <sam.voss@gmail.com>
+[Antoine: update for 14.0.3]
+Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
 ---
  .github/workflows/ci.yml      | 6 ++++++
  .github/workflows/release.yml | 8 +++++++-
@@ -18,10 +20,10 @@ Signed-off-by: Sam Voss <sam.voss@gmail.com>
  5 files changed, 35 insertions(+), 4 deletions(-)
 
 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
-index ab154ec..aa567d9 100644
+index b37753e..a2cdeee 100644
 --- a/.github/workflows/ci.yml
 +++ b/.github/workflows/ci.yml
-@@ -149,6 +149,12 @@ jobs:
+@@ -160,6 +160,12 @@ jobs:
        if: matrix.target != ''
        run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }}
  
@@ -31,14 +33,14 @@ index ab154ec..aa567d9 100644
 +      if: matrix.os == 'nightly-musl'
 +      run: ${{ env.CARGO }} test --verbose --all --features jemalloc ${{ env.TARGET_FLAGS }}
 +
-     - name: Test for existence of build artifacts (Windows)
-       if: matrix.os == 'windows-2019'
-       shell: bash
+     - name: Test zsh shell completions (Unix, sans cross)
+       # We could test this when using Cross, but we'd have to execute the
+       # 'rg' binary (done in test-complete) with qemu, which is a pain and
 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
-index 7cfb6a4..ad6b82d 100644
+index b10c076..58a7a12 100644
 --- a/.github/workflows/release.yml
 +++ b/.github/workflows/release.yml
-@@ -133,7 +133,13 @@ jobs:
+@@ -153,7 +153,13 @@ jobs:
          echo "target flag is: ${{ env.TARGET_FLAGS }}"
          echo "target dir is: ${{ env.TARGET_DIR }}"
  
@@ -50,25 +52,25 @@ index 7cfb6a4..ad6b82d 100644
 +
 +    - name: Build release binary (non-linux)
 +      if: matrix.build != 'linux'
-       run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
- 
-     - name: Strip release binary (linux and macos)
+       shell: bash
+       run: |
+         ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
 diff --git a/Cargo.toml b/Cargo.toml
-index fb78fcb..0d34b1e 100644
+index f30cc0b..6fe4c79 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -56,8 +56,9 @@ version = "2.33.0"
- default-features = false
- features = ["suggestions"]
+@@ -59,8 +59,9 @@ serde_json = "1.0.23"
+ termcolor = "1.1.0"
+ textwrap = { version = "0.16.0", default-features = false }
  
 -[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
 +[dependencies.jemallocator]
- version = "0.3.0"
+ version = "0.5.0"
 +optional = true
  
- [build-dependencies]
- lazy_static = "1.1.0"
-@@ -75,6 +76,11 @@ walkdir = "2"
+ [dev-dependencies]
+ serde = "1.0.77"
+@@ -70,6 +71,11 @@ walkdir = "2"
  [features]
  simd-accel = ["grep/simd-accel"]
  pcre2 = ["grep/pcre2"]
@@ -81,10 +83,10 @@ index fb78fcb..0d34b1e 100644
  [profile.release]
  debug = 1
 diff --git a/README.md b/README.md
-index 46938bc..9917b29 100644
+index 63c0725..3d35819 100644
 --- a/README.md
 +++ b/README.md
-@@ -406,6 +406,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
+@@ -442,6 +442,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
  `musl-gcc` installed, which might be in a separate package from the actual
  MUSL library, depending on your Linux distribution.
  
@@ -101,10 +103,10 @@ index 46938bc..9917b29 100644
  ### Running tests
  
 diff --git a/crates/core/main.rs b/crates/core/main.rs
-index 47385de..c9dae5a 100644
+index 64f35ce..9aa6663 100644
 --- a/crates/core/main.rs
 +++ b/crates/core/main.rs
-@@ -31,7 +31,7 @@ mod subject;
+@@ -27,7 +27,7 @@ mod search;
  // have the fastest version of everything. Its goal is to be small and amenable
  // to static compilation.) Even though ripgrep isn't particularly allocation
  // heavy, musl's allocator appears to slow down ripgrep quite a bit. Therefore,
@@ -113,7 +115,7 @@ index 47385de..c9dae5a 100644
  //
  // We don't unconditionally use jemalloc because it can be nice to use the
  // system's default allocator by default. Moreover, jemalloc seems to increase
-@@ -39,7 +39,11 @@ mod subject;
+@@ -35,7 +35,11 @@ mod search;
  //
  // Moreover, we only do this on 64-bit systems since jemalloc doesn't support
  // i686.
@@ -127,5 +129,5 @@ index 47385de..c9dae5a 100644
  static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
  
 -- 
-2.32.0
+2.25.1
 
diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash
index 71e74e1bcf..ff86c12ad5 100644
--- a/package/ripgrep/ripgrep.hash
+++ b/package/ripgrep/ripgrep.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8  ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz
+sha256  2f022889c999ffe00955e586fe24b334d1c79060978fc41b95b52a30946e65d0  ripgrep-14.0.3.tar.gz
 sha256  0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f  LICENSE-MIT
diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk
index d587441cfa..44662749bb 100644
--- a/package/ripgrep/ripgrep.mk
+++ b/package/ripgrep/ripgrep.mk
@@ -4,11 +4,7 @@
 #
 ################################################################################
 
-# Same as 13.0.0, we use a Git commit hash because the hash of this
-# tarball changed when moving to the cargo-package infrastructure, and
-# we can't change the hash of existing tarball. Please switch back to
-# a Git tag at the next version bump.
-RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5
+RIPGREP_VERSION = 14.0.3
 RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION))
 RIPGREP_LICENSE = MIT
 RIPGREP_LICENSE_FILES = LICENSE-MIT
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [Buildroot] [PATCH v2 3/3] support/testing: test_rust.py: Add test to check correct vendoring
  2023-12-28 15:26 [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1 Antoine Coutant
  2023-12-28 15:26 ` [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3 Antoine Coutant
@ 2023-12-28 15:26 ` Antoine Coutant
  2023-12-30 18:01 ` [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1 Thomas Petazzoni via buildroot
  2 siblings, 0 replies; 15+ messages in thread
From: Antoine Coutant @ 2023-12-28 15:26 UTC (permalink / raw)
  To: buildroot; +Cc: Antoine Coutant, romain.naour, sebastian.weyer

From: Sebastian Weyer <sebastian.weyer@smile.fr>

Currently the tests TestRust and TestRustBin do check for vendoring by
requiring package ripgrep to be built but only if the download
directory is already empty, otherwise the existing contents of the download
directory will be reused and therefore not be redownloaded.

This new test will only verify that the required packages are downloaded
and vendored correctly without doing a runtime test. It does so by setting a
path to a folder "dl" inside the build directory (output-directory/testname/)
and then setting the environment variable BR2_DL_DIR to this path before the
build starts. BR2_DL_DIR is not set in the config options because it would be
overridden by the user's own environment variable if defined. This code was
essentially copied from the file test_gitforge.py which was added in commit
1ca6ab6ace3c1f9edfbfd16b57d1280b3ea2c6f5

We want the package ripgrep to be built since it requires vendoring
directly. Additionally we want the package python-cryptography to be
built because it has rust dependencies and therefore indirectly also requires
vendoring.

Signed-off-by: Sebastian Weyer <sebastian.weyer@smile.fr>
Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
---
Changes v1 -> v2:
	- make the change proposed here:
	http://patchwork.ozlabs.org/project/buildroot/patch/20230207165031.17188-1-sebastian.weyer@smile.fr/
---
 support/testing/tests/package/test_rust.py | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py
index fb9dd2d916..763125ca20 100644
--- a/support/testing/tests/package/test_rust.py
+++ b/support/testing/tests/package/test_rust.py
@@ -1,4 +1,5 @@
 import os
+import shutil
 
 import infra.basetest
 
@@ -54,3 +55,44 @@ class TestRust(TestRustBase):
     def test_run(self):
         self.login()
         self.assertRunOk("rg Buildroot /etc/issue")
+
+
+class TestRustVendoring(infra.basetest.BRConfigTest):
+    config = \
+        """
+        BR2_arm=y
+        BR2_cortex_a9=y
+        BR2_ARM_ENABLE_NEON=y
+        BR2_ARM_ENABLE_VFP=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        BR2_PACKAGE_HOST_RUSTC=y
+        BR2_PACKAGE_RIPGREP=y
+        BR2_PACKAGE_PYTHON3=y
+        BR2_PACKAGE_PYTHON_CRYPTOGRAPHY=y
+        BR2_BACKUP_SITE=""
+        """
+
+    def setUp(self):
+        super(TestRustVendoring, self).setUp()
+
+    def tearDown(self):
+        self.show_msg("Cleaning up")
+        if self.b and not self.keepbuilds:
+            self.b.delete()
+
+    def check_download(self, package):
+        # store downloaded tarball inside the output dir so the test infra
+        # cleans it up at the end
+        dl_dir = os.path.join(self.builddir, "dl")
+        # enforce we test the download
+        if os.path.exists(dl_dir):
+            shutil.rmtree(dl_dir)
+        env = {"BR2_DL_DIR": dl_dir}
+        self.b.build(["{}-dirclean".format(package),
+                      "{}-legal-info".format(package)],
+                     env)
+
+    def test_run(self):
+        self.check_download("ripgrep")
+        self.check_download("python-cryptography")
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-28 15:26 ` [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3 Antoine Coutant
@ 2023-12-29 22:13   ` Yann E. MORIN
  2023-12-30 18:00     ` Thomas Petazzoni via buildroot
  2023-12-31 14:36   ` Yann E. MORIN
  1 sibling, 1 reply; 15+ messages in thread
From: Yann E. MORIN @ 2023-12-29 22:13 UTC (permalink / raw)
  To: Antoine Coutant; +Cc: romain.naour, sebastian.weyer, buildroot

Antoine, All,

Thanks for this patchset!

On 2023-12-28 16:26 +0100, Antoine Coutant spake thusly:
> ripgrep previous version hash is no longer valid.
> The tarball is modified by rust vendoring so the hash
> may change with rust versions.

If that's so, then we have a big problem: the hashes for all the
cargo-based packages will change, and thus it means we will have to
name the generated archive based on the cargo version used to do the
vendoring. That would apply to:

    package/bat/bat.mk
    package/dust/dust.mk
    package/eza/eza.mk
    package/hyperfine/hyperfine.mk
    package/nushell/nushell.mk
    package/procs/procs.mk
    package/ripgrep/ripgrep.mk
    package/rust-bindgen/rust-bindgen.mk
    package/sentry-cli/sentry-cli.mk
    package/tealdeer/tealdeer.mk

Can you clarify this point, please?

Regards,
Yann E. MORIN.

> The patch has been rebased to ripgrep 14.0.3.
> 
> Changelog:
> https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md
> 
> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
> ---
> 
> Tested using qemu_aarch64_virt_defconfig and Arm AArch64 13.2.rel1
> toolchain.
> 
> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
> ---
>  ...llocator-behind-a-cargo-feature-flag.patch | 52 ++++++++++---------
>  package/ripgrep/ripgrep.hash                  |  2 +-
>  package/ripgrep/ripgrep.mk                    |  6 +--
>  3 files changed, 29 insertions(+), 31 deletions(-)
> 
> diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
> index e2ba68f389..aa073c6e7f 100644
> --- a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
> +++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
> @@ -1,4 +1,4 @@
> -From 68c2a4d7a5d9b46f65121958fdb12d5270bfd1b6 Mon Sep 17 00:00:00 2001
> +From e4df6678e3e2d018acccafd47d1e484887d23323 Mon Sep 17 00:00:00 2001
>  From: Jonathan Stites <mail@jonstites.com>
>  Date: Wed, 6 May 2020 12:55:35 +0000
>  Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag
> @@ -9,6 +9,8 @@ Moves jemalloc behind a feature for musl builds, where it is not
>  supported by the upstream project, so ripgrep will fail to build.
>  
>  Signed-off-by: Sam Voss <sam.voss@gmail.com>
> +[Antoine: update for 14.0.3]
> +Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
>  ---
>   .github/workflows/ci.yml      | 6 ++++++
>   .github/workflows/release.yml | 8 +++++++-
> @@ -18,10 +20,10 @@ Signed-off-by: Sam Voss <sam.voss@gmail.com>
>   5 files changed, 35 insertions(+), 4 deletions(-)
>  
>  diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
> -index ab154ec..aa567d9 100644
> +index b37753e..a2cdeee 100644
>  --- a/.github/workflows/ci.yml
>  +++ b/.github/workflows/ci.yml
> -@@ -149,6 +149,12 @@ jobs:
> +@@ -160,6 +160,12 @@ jobs:
>         if: matrix.target != ''
>         run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }}
>   
> @@ -31,14 +33,14 @@ index ab154ec..aa567d9 100644
>  +      if: matrix.os == 'nightly-musl'
>  +      run: ${{ env.CARGO }} test --verbose --all --features jemalloc ${{ env.TARGET_FLAGS }}
>  +
> -     - name: Test for existence of build artifacts (Windows)
> -       if: matrix.os == 'windows-2019'
> -       shell: bash
> +     - name: Test zsh shell completions (Unix, sans cross)
> +       # We could test this when using Cross, but we'd have to execute the
> +       # 'rg' binary (done in test-complete) with qemu, which is a pain and
>  diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
> -index 7cfb6a4..ad6b82d 100644
> +index b10c076..58a7a12 100644
>  --- a/.github/workflows/release.yml
>  +++ b/.github/workflows/release.yml
> -@@ -133,7 +133,13 @@ jobs:
> +@@ -153,7 +153,13 @@ jobs:
>           echo "target flag is: ${{ env.TARGET_FLAGS }}"
>           echo "target dir is: ${{ env.TARGET_DIR }}"
>   
> @@ -50,25 +52,25 @@ index 7cfb6a4..ad6b82d 100644
>  +
>  +    - name: Build release binary (non-linux)
>  +      if: matrix.build != 'linux'
> -       run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
> - 
> -     - name: Strip release binary (linux and macos)
> +       shell: bash
> +       run: |
> +         ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
>  diff --git a/Cargo.toml b/Cargo.toml
> -index fb78fcb..0d34b1e 100644
> +index f30cc0b..6fe4c79 100644
>  --- a/Cargo.toml
>  +++ b/Cargo.toml
> -@@ -56,8 +56,9 @@ version = "2.33.0"
> - default-features = false
> - features = ["suggestions"]
> +@@ -59,8 +59,9 @@ serde_json = "1.0.23"
> + termcolor = "1.1.0"
> + textwrap = { version = "0.16.0", default-features = false }
>   
>  -[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
>  +[dependencies.jemallocator]
> - version = "0.3.0"
> + version = "0.5.0"
>  +optional = true
>   
> - [build-dependencies]
> - lazy_static = "1.1.0"
> -@@ -75,6 +76,11 @@ walkdir = "2"
> + [dev-dependencies]
> + serde = "1.0.77"
> +@@ -70,6 +71,11 @@ walkdir = "2"
>   [features]
>   simd-accel = ["grep/simd-accel"]
>   pcre2 = ["grep/pcre2"]
> @@ -81,10 +83,10 @@ index fb78fcb..0d34b1e 100644
>   [profile.release]
>   debug = 1
>  diff --git a/README.md b/README.md
> -index 46938bc..9917b29 100644
> +index 63c0725..3d35819 100644
>  --- a/README.md
>  +++ b/README.md
> -@@ -406,6 +406,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
> +@@ -442,6 +442,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
>   `musl-gcc` installed, which might be in a separate package from the actual
>   MUSL library, depending on your Linux distribution.
>   
> @@ -101,10 +103,10 @@ index 46938bc..9917b29 100644
>   ### Running tests
>   
>  diff --git a/crates/core/main.rs b/crates/core/main.rs
> -index 47385de..c9dae5a 100644
> +index 64f35ce..9aa6663 100644
>  --- a/crates/core/main.rs
>  +++ b/crates/core/main.rs
> -@@ -31,7 +31,7 @@ mod subject;
> +@@ -27,7 +27,7 @@ mod search;
>   // have the fastest version of everything. Its goal is to be small and amenable
>   // to static compilation.) Even though ripgrep isn't particularly allocation
>   // heavy, musl's allocator appears to slow down ripgrep quite a bit. Therefore,
> @@ -113,7 +115,7 @@ index 47385de..c9dae5a 100644
>   //
>   // We don't unconditionally use jemalloc because it can be nice to use the
>   // system's default allocator by default. Moreover, jemalloc seems to increase
> -@@ -39,7 +39,11 @@ mod subject;
> +@@ -35,7 +35,11 @@ mod search;
>   //
>   // Moreover, we only do this on 64-bit systems since jemalloc doesn't support
>   // i686.
> @@ -127,5 +129,5 @@ index 47385de..c9dae5a 100644
>   static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
>   
>  -- 
> -2.32.0
> +2.25.1
>  
> diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash
> index 71e74e1bcf..ff86c12ad5 100644
> --- a/package/ripgrep/ripgrep.hash
> +++ b/package/ripgrep/ripgrep.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8  ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz
> +sha256  2f022889c999ffe00955e586fe24b334d1c79060978fc41b95b52a30946e65d0  ripgrep-14.0.3.tar.gz
>  sha256  0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f  LICENSE-MIT
> diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk
> index d587441cfa..44662749bb 100644
> --- a/package/ripgrep/ripgrep.mk
> +++ b/package/ripgrep/ripgrep.mk
> @@ -4,11 +4,7 @@
>  #
>  ################################################################################
>  
> -# Same as 13.0.0, we use a Git commit hash because the hash of this
> -# tarball changed when moving to the cargo-package infrastructure, and
> -# we can't change the hash of existing tarball. Please switch back to
> -# a Git tag at the next version bump.
> -RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5
> +RIPGREP_VERSION = 14.0.3
>  RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION))
>  RIPGREP_LICENSE = MIT
>  RIPGREP_LICENSE_FILES = LICENSE-MIT
> -- 
> 2.25.1
> 
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-29 22:13   ` Yann E. MORIN
@ 2023-12-30 18:00     ` Thomas Petazzoni via buildroot
  2023-12-30 19:44       ` Yann E. MORIN
  0 siblings, 1 reply; 15+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-12-30 18:00 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: Antoine Coutant, romain.naour, sebastian.weyer, buildroot

On Fri, 29 Dec 2023 23:13:35 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> If that's so, then we have a big problem: the hashes for all the
> cargo-based packages will change, and thus it means we will have to
> name the generated archive based on the cargo version used to do the
> vendoring. That would apply to:

Note that I also encountered some hash mismatch on some Rust/Cargo
package recently, and BR was falling back to sources.buildroot.net. I
did not have the time to investigate at the time (I was looking into
another issue, and didn't want to enter an infinite recursion of
problem solving quest). And now, I don't remember with which package I
encountered this. But yes, it seems like we have a reproducibility
issue.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1
  2023-12-28 15:26 [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1 Antoine Coutant
  2023-12-28 15:26 ` [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3 Antoine Coutant
  2023-12-28 15:26 ` [Buildroot] [PATCH v2 3/3] support/testing: test_rust.py: Add test to check correct vendoring Antoine Coutant
@ 2023-12-30 18:01 ` Thomas Petazzoni via buildroot
  2 siblings, 0 replies; 15+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-12-30 18:01 UTC (permalink / raw)
  To: Antoine Coutant; +Cc: romain.naour, sebastian.weyer, buildroot

On Thu, 28 Dec 2023 16:26:55 +0100
Antoine Coutant <antoine.coutant@smile.fr> wrote:

> Link to Rust 1.74.1 announcement:
> https://blog.rust-lang.org/2023/12/07/Rust-1.74.1.html
> 
> The mips*-unknown-linux-gnu* targets were removed from
> stage 2 with host tools in version 1.72.0.
> Release note:
> https://github.com/rust-lang/rust/releases/tag/1.72.0
> 
> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
> ---
> Tested with ripgrep using qemu_aarch64_virt_defconfig.
> ---
>  package/rust-bin/rust-bin.hash | 236 +++++++++++++++------------------
>  package/rust-bin/rust-bin.mk   |   2 +-
>  package/rust/rust.hash         |   6 +-
>  package/rust/rust.mk           |   2 +-
>  package/rustc/Config.in.host   |  10 --
>  5 files changed, 114 insertions(+), 142 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-30 18:00     ` Thomas Petazzoni via buildroot
@ 2023-12-30 19:44       ` Yann E. MORIN
  2023-12-30 22:08         ` Yann E. MORIN
  2023-12-31  9:25         ` Yann E. MORIN
  0 siblings, 2 replies; 15+ messages in thread
From: Yann E. MORIN @ 2023-12-30 19:44 UTC (permalink / raw)
  To: Thomas Petazzoni
  Cc: Antoine Coutant, romain.naour, sebastian.weyer, buildroot

Thomas, All,

On 2023-12-30 19:00 +0100, Thomas Petazzoni via buildroot spake thusly:
> On Fri, 29 Dec 2023 23:13:35 +0100
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> > If that's so, then we have a big problem: the hashes for all the
> > cargo-based packages will change, and thus it means we will have to
> > name the generated archive based on the cargo version used to do the
> > vendoring. That would apply to:
> Note that I also encountered some hash mismatch on some Rust/Cargo
> package recently, and BR was falling back to sources.buildroot.net. I
> did not have the time to investigate at the time (I was looking into
> another issue, and didn't want to enter an infinite recursion of
> problem solving quest). And now, I don't remember with which package I
> encountered this. But yes, it seems like we have a reproducibility
> issue.

So, I tested with commit b7938d2, i.e. before the rust version bump, and
ripgrep already has a hash issue:

    ERROR: ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz has wrong sha256 hash:
    ERROR: expected: 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8
    ERROR: got     : 9d9769e45ffe6089f58bc19fa39dd6b6299aa0c3ad90508d21dfa27a3d3416d5

In 2023-01-01, it was already failing but the reported hash was
different:

http://autobuild.buildroot.org/results/43d/43d9b993a019c9c46701924f664476c2ac900b2b/build-end.log

    ERROR: got     : ed72a5ad6592c2c605ed9712e896872fd3858b94895601dbbb9f7d2a94b105af

Then on 2023-06-25, a vendoring suceeded (the last ripgrep build failure
reported in autobuilder):

http://autobuild.buildroot.org/results/15b/15bea8d3bc8765ec9088c5bc380d482caee1b6d5/build-end.log

Then, I had hash issues with host-sentry-cli, too:

    ERROR: sentry-cli-2.20.3.tar.gz has wrong sha256 hash:
    ERROR: expected: 2188b8eead4f2b6543725b23852427bea164e8dd76bf1ce33f41ca0c03cfeee7
    ERROR: got     : 4db94489e7c427ff092483529eee56229fa764b619669f9f9e6e663cc4a05abc

The other cargo-vendored packages were all OK.

Then, with the rust version bump to 1.74.1, the vendoring status is
unchanged:

  - ripgrep fails vendoring, and reports the same hash failure
  - host-sentry-cli fails vendoring, again with the same reported hash
    failure
  - all other cargo-vendored packages are fine and don't need a hash
    bump because of th rust bump.

So, we need to understand why we have two cargo-vendored packages that
are not reproducible...

More investigations later on...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-30 19:44       ` Yann E. MORIN
@ 2023-12-30 22:08         ` Yann E. MORIN
  2023-12-31  9:25         ` Yann E. MORIN
  1 sibling, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2023-12-30 22:08 UTC (permalink / raw)
  To: Thomas Petazzoni
  Cc: Antoine Coutant, romain.naour, sebastian.weyer, buildroot

Thomas, Antoine, All,

On 2023-12-30 20:44 +0100, Yann E. MORIN spake thusly:
> On 2023-12-30 19:00 +0100, Thomas Petazzoni via buildroot spake thusly:
> > On Fri, 29 Dec 2023 23:13:35 +0100
> > "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> > > If that's so, then we have a big problem: the hashes for all the
> > > cargo-based packages will change, and thus it means we will have to
> > > name the generated archive based on the cargo version used to do the
> > > vendoring. That would apply to:
> > Note that I also encountered some hash mismatch on some Rust/Cargo
> > package recently, and BR was falling back to sources.buildroot.net. I
> > did not have the time to investigate at the time (I was looking into
> > another issue, and didn't want to enter an infinite recursion of
> > problem solving quest). And now, I don't remember with which package I
> > encountered this. But yes, it seems like we have a reproducibility
> > issue.
[--SNIP--]
>   - ripgrep fails vendoring, and reports the same hash failure
>   - host-sentry-cli fails vendoring, again with the same reported hash
>     failure

diffoscope to the rescue: the only change in either package, is a single
file that got its mode bits changed (context elided for brevity):

    --- ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar
    +++ ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5-2.tar
    ├── file list
    │ @@ -2731,1 +2731,1 @@
    │ --rwxr-x---   0        0        0    10719 2021-06-12 12:12:24.000000 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5/VENDOR/unicode-width/scripts/unicode.py
    │ +-rwxr-x--x   0        0        0    10719 2021-06-12 12:12:24.000000 ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5/VENDOR/unicode-width/scripts/unicode.py

    --- sentry-cli-2.20.3.tar
    +++ sentry-cli-2.20.3-2.tar
    ├── file list
    │ @@ -15292,1 +15292,1 @@
    │ --rwx------   0        0        0     1796 2023-07-31 09:58:46.000000 sentry-cli-2.20.3/VENDOR/username/src/lib.rs
    │ +-rwx--x--x   0        0        0     1796 2023-07-31 09:58:46.000000 sentry-cli-2.20.3/VENDOR/username/src/lib.rs

In either case, a single file had its mode bits changed, and it smells
like go+X was applied.

It seems that cargo did change its behaviour at some point, as the
archive as manually downloaded from crates.io does have the executable
bits as we originally expected:

    $ wget -O unicode-width-0.1.8.tar.gz https://crates.io/api/v1/crates/unicode-width/0.1.8/download
    $ tar xzf unicode-width-0.1.8.tar.gz
    $ ls -hl unicode-width-0.1.8/scripts/unicode.py
    -rwxr-x---. 1 ymorin ymorin 11K Jun 29  2020 unicode-width-0.1.8/scripts/unicode.py*
    $ wget -O username-0.2.0.tar.gz https://crates.io/api/v1/crates/username/0.2.0/download
    $ tar xzf username-0.2.0.tar.gz
    $ ls -hl username-0.2.0/src/lib.rs
    -rwx------. 1 ymorin ymorin 1.8K Aug 10  2017 username-0.2.0/src/lib.rs

I could not find anything relevant in the cargo bug tracker:
    https://github.com/rust-lang/cargo/issues?q=is%3Aissue+vendor+executable+bit

So, I have no clue what the best course of action would be. The
short-term workaround is to chop-off one more digit from the ripgrep
version and recalculate a new hash for it, and for sentry-cli maybe we
can update the version (or switch to a commit hash).

Probably we will want at some point to introduce a vendoring version,
like we have for the git and svn methods. so that we can update rust
(and thus cargo) without requiring a version bump/tweak for all affected
packages...

As an aside, the situation for sentry-cli is a bit concerning: the
'username' crate only ever had one release, 0.2.0, over 6 years ago
now, and the documentation and repository listed on the crates.io
page no longer exist:

    https://crates.io/crates/username
    http://pijul.org/user/doc/user/index.html   => 404
    https://pijul.org/darcs/user                => 404

Meh?...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-30 19:44       ` Yann E. MORIN
  2023-12-30 22:08         ` Yann E. MORIN
@ 2023-12-31  9:25         ` Yann E. MORIN
  2023-12-31 11:01           ` Yann E. MORIN
  1 sibling, 1 reply; 15+ messages in thread
From: Yann E. MORIN @ 2023-12-31  9:25 UTC (permalink / raw)
  To: Thomas Petazzoni
  Cc: Eric Le Bihan, sebastian.weyer, Antoine Coutant, James Hilliard,
	buildroot, romain.naour

Thomas, Antoine, All,

+James and Eric fr their previous work on the rust side

On 2023-12-30 20:44 +0100, Yann E. MORIN spake thusly:
> On 2023-12-30 19:00 +0100, Thomas Petazzoni via buildroot spake thusly:
> > On Fri, 29 Dec 2023 23:13:35 +0100
> > "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> > Note that I also encountered some hash mismatch on some Rust/Cargo
> > package recently, and BR was falling back to sources.buildroot.net. I
> > did not have the time to investigate at the time (I was looking into
> > another issue, and didn't want to enter an infinite recursion of
> > problem solving quest). And now, I don't remember with which package I
> > encountered this. But yes, it seems like we have a reproducibility
> > issue.
> So, I tested with commit b7938d2, i.e. before the rust version bump, and
> ripgrep already has a hash issue:
>     ERROR: ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz has wrong sha256 hash:
>     ERROR: expected: 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8
>     ERROR: got     : 9d9769e45ffe6089f58bc19fa39dd6b6299aa0c3ad90508d21dfa27a3d3416d5

I took some time to try and pinpoint the issue. Alas, I have no clue,
just more questions.

I first tried to reproduce the original hash for ripgrep, i.e. when it
was converted over to the cargo infra, commit 342fd3e735. But that fails
to build because of an unrelated issue in the package infra, which was
fixed a few commits later, e27a700f3e.

And on that commit, it fails to reproduce a valid hash here: the hash I
got was again something else totally:
    ERROR: got     : 37d14c1eecb24e5b921c3b0e8a22ed93501db6f7aa4d0732d6be03dfc8647f77

This is very troubling. My system is a Fedora 39 recently installed on
my new laptop. What about I try and reproduce on an older system that
was current back when ripgrep was converted? So I used that old Ubuntu
16.04 that lies around, and there, miracle, the hash for ripgrep, on
commit e27a700f3e, does match what we expect!

So, can that machine get us a proper hash for ripgrep on master? Nope;
    ERROR: got     : 9d9769e45ffe6089f58bc19fa39dd6b6299aa0c3ad90508d21dfa27a3d3416d5

OK, back to square one.

So, can our (current) docker-run wrapper help us? Back to commit
e27a700f3e, which is known good on ubuntu 16.04, but bad on Fedora 39:

    ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz: OK (sha256: 6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8)

OK, so what, now?

As a reminder, commit e27a700f3e contains the core infra fix just after
the conversion of ripgrep to the cargo infra. Here's a little summary of
what happens

                            e27a700f3e      master
    Ubuntu 16.04.7;
      - native              OK              KO +
    Fedora 39:
      - native              KO *            KO +
      - ./utils/docker-run  OK              KO +

*: hash 37d14c1eecb24e5b921c3b0e8a22ed93501db6f7aa4d0732d6be03dfc8647f77
+: hash 9d9769e45ffe6089f58bc19fa39dd6b6299aa0c3ad90508d21dfa27a3d3416d5

So, we have two issues:

  - the cargo version has an impact on the vendoring

  - the build environment has an impact on the vendoring.

On my side, further investigations will probably have to wait for next
year... Notably, I'll try and see what diffoscope points out as a delta
between those various tarballs...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-31  9:25         ` Yann E. MORIN
@ 2023-12-31 11:01           ` Yann E. MORIN
  2023-12-31 14:25             ` Yann E. MORIN
  0 siblings, 1 reply; 15+ messages in thread
From: Yann E. MORIN @ 2023-12-31 11:01 UTC (permalink / raw)
  To: Thomas Petazzoni
  Cc: Eric Le Bihan, sebastian.weyer, Antoine Coutant, James Hilliard,
	buildroot, romain.naour

All,

On 2023-12-31 10:25 +0100, Yann E. MORIN spake thusly:
> On 2023-12-30 20:44 +0100, Yann E. MORIN spake thusly:
> > On 2023-12-30 19:00 +0100, Thomas Petazzoni via buildroot spake thusly:
> > > Note that I also encountered some hash mismatch on some Rust/Cargo
> > > package recently, and BR was falling back to sources.buildroot.net. I
> > > did not have the time to investigate at the time (I was looking into
> > > another issue, and didn't want to enter an infinite recursion of
> > > problem solving quest). And now, I don't remember with which package I
> > > encountered this. But yes, it seems like we have a reproducibility
> > > issue.
[--SNIP--]
> I took some time to try and pinpoint the issue. Alas, I have no clue,
> just more questions.
[--SNIP--]
> As a reminder, commit e27a700f3e contains the core infra fix just after
> the conversion of ripgrep to the cargo infra. Here's a little summary of
> what happens
> 
>                             e27a700f3e      master
>     Ubuntu 16.04.7;
>       - native              OK              KO +
>     Fedora 39:
>       - native              KO *            KO +
>       - ./utils/docker-run  OK              KO +
> 
> So, we have two issues:
>   - the cargo version has an impact on the vendoring
>   - the build environment has an impact on the vendoring.

So, turned out that, on F39, we hit the tar 1.35 issue on e27a700f3e.
Building host-tar before trying to vendor ripgrep fixes the issue.

So, at least, that's that: we *can* reproduce the proper hash for
ripgrep at the time it was bumped.

So, we're now left with just the cargo version issue... Which is in fact
rather good news: we do not have an unknown dependency on the build
environment.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-31 11:01           ` Yann E. MORIN
@ 2023-12-31 14:25             ` Yann E. MORIN
  0 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2023-12-31 14:25 UTC (permalink / raw)
  To: Thomas Petazzoni
  Cc: Eric Le Bihan, sebastian.weyer, Antoine Coutant, James Hilliard,
	buildroot, romain.naour

All,

On 2023-12-31 12:01 +0100, Yann E. MORIN spake thusly:
> On 2023-12-31 10:25 +0100, Yann E. MORIN spake thusly:
> > On 2023-12-30 20:44 +0100, Yann E. MORIN spake thusly:
> > > On 2023-12-30 19:00 +0100, Thomas Petazzoni via buildroot spake thusly:
> > > > Note that I also encountered some hash mismatch on some Rust/Cargo
> > > > package recently, and BR was falling back to sources.buildroot.net. I
> > > > did not have the time to investigate at the time (I was looking into
> > > > another issue, and didn't want to enter an infinite recursion of
> > > > problem solving quest). And now, I don't remember with which package I
> > > > encountered this. But yes, it seems like we have a reproducibility
> > > > issue.
[--SNIP--]
> So, we're now left with just the cargo version issue... Which is in fact
> rather good news: we do not have an unknown dependency on the build
> environment.

So, I could not resist starting a git-bisect.

I assumed that the issue was due to some rust version bump. So, now that
I had established that the conversion of ripgrep over to the cargo infra
was indeed correct, and that the bump to rust 1.74.1 (i.e. master as it
is today) produces an incorrectly vendored tarball, I started a git
bisect looking for the rust version bump that introduced the failure:

    $ cat defconfig
    BR2_arm=y
    BR2_cortex_a7=y
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
    BR2_BACKUP_SITE=""
    BR2_PACKAGE_RIPGREP=y

    $ export BR2_DL_DIR=$(pwd)/trash-dl

    $ git bisect 05392a5eae6 e27a700f3e140 -- package/rust-bin/
    $ rm -rf "${BR2_DL_DIR}"; make clean; make ripgrep-source

Rince and repeat until the first bad commit is found, and... tada...
It's the bump to rust 1.74.1 that casues the build failure!

Wait, wait, no, that can't be correct: I remember that 05392a5eae6^ was
bad. And indeed, a manual test on 05392a5eae6^ yields a broken
vendoring. Damn.

OK, so e27a700f3e140 *is* defnitely correct, while both 05392a5eae6^ and
05392a5eae6 *are* definitely bad, and there was no rust version bump
in-between. So something else causes the bad vendoring.

Let's start a full git bisect on the whole tree, not limited to jsut
rust version bumps:

    $ export BR2_DL_DIR=$(pwd)/trash-dl

    $ git bisect 05392a5eae6 e27a700f3e140
    $ rm -rf "${BR2_DL_DIR}"; make clean; make ripgrep-source

Rnce and repeat, and after quite a few more tests compared to the
previos bisect, we eventually find the first bad commit.

Sorry, that's all my fault:

    768f9f80f62c1da6e298c680f0f4bfa887f38c78 is the first bad commit
    commit 768f9f80f62c1da6e298c680f0f4bfa887f38c78
    Author: Yann E. MORIN <yann.morin.1998@free.fr>
    Date:   Wed Sep 13 00:15:49 2023 +0200

        support/download: generate even more reproducible tarballs

        When we generate the taballs off a local working copy of a VCS tree,
        the umask is the one that we enforce in out top-level Makefile.

        However, it is possible that a user manually tinkers in said working
        copy (e.g. to check an upstream bug fix, or regression). If the user
        umask is different from the one Buildroot enfirces, such tinkering
        can impact the mode bits of the files, even if their content is not
        modified.

        When we eventually need to create a tarball from said working copy,
        the VCS (e.g. git) will only be interested in checking whether the
        content of the files have changed before chcking them out, and will
        not look at, and restore/fix the mode bits.

        As a consequence, we may create non-reproducible archives.

        We fix that by enforcing the mode bits on the files before we create
        the tarball: we disable the write and execute bits, and only set the
        execute bit if the user execute bit is set.

        Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
        Cc: Vincent Fazio <vfazio@xes-inc.com>
        Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

     support/download/helpers | 3 +++
     1 file changed, 3 insertions(+)

So, I am not 100% sure how to fix that...

For master, it's relatively trivial: we can bump the version and compute
a new hash, and be done with that.

But for the 2023.11 maintenance branch, which contains the commit above,
we do not want to bump the versions. For ripgrep, we have a way out: we
can chop one digit off the end of the commit hash, and recompute the new
hash, and that's going to be OK. For sentry-cli, since we use a version
string, not a hash, we don't have much choice but to switch over to
using a commit hash from github...

And more generally, we do not have a way to express the fact that our
download infra changes. For git and svn, we do have a per-backend
version, but not for the generic infra, nor for the vendoring
post-processs...

I'll think a bit more on that, and send patches as soon as I can...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-28 15:26 ` [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3 Antoine Coutant
  2023-12-29 22:13   ` Yann E. MORIN
@ 2023-12-31 14:36   ` Yann E. MORIN
  2024-01-10 14:22     ` Romain Naour
  2024-01-10 14:29     ` Antoine Coutant
  1 sibling, 2 replies; 15+ messages in thread
From: Yann E. MORIN @ 2023-12-31 14:36 UTC (permalink / raw)
  To: Antoine Coutant; +Cc: romain.naour, sebastian.weyer, buildroot

Antoine, All,

On 2023-12-28 16:26 +0100, Antoine Coutant spake thusly:
> ripgrep previous version hash is no longer valid.
> The tarball is modified by rust vendoring so the hash
> may change with rust versions.

This was very concerning, and if that had been true, could not have
been solved just by bumping the version. Indeed, it is not always
possible to bump the version, e.g. when the package is already using
the latest version.

Furthermore, it was a bit surprising that only ripgrep was impacted, not
all the other cargo-vendored packages. And it turned out that indeed,
another package was impacted, sentry-cli (but we only have the host
variant of it).

So, that really needed more investigations, to provide a more solid
explanation why the hash was wrong, and if possible identify the point
in the cargo history where the change happened, to ask upstream if the
vendoring scheme was stable or not (in that latter case, we'd have had
to introduce the versioning of the vendored archives).

However, as you can see in the rest of this thread, the issue has
nothing to do with cargo vendoring, in fact, and is caused by an
unrelated change in the download infra (my fault!).

So, the ripgrep version bump is OK, but not for the correct reasons. ;-)

Regards,
Yann E. MORIN.

> The patch has been rebased to ripgrep 14.0.3.
> 
> Changelog:
> https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md
> 
> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
> ---
> 
> Tested using qemu_aarch64_virt_defconfig and Arm AArch64 13.2.rel1
> toolchain.
> 
> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
> ---
>  ...llocator-behind-a-cargo-feature-flag.patch | 52 ++++++++++---------
>  package/ripgrep/ripgrep.hash                  |  2 +-
>  package/ripgrep/ripgrep.mk                    |  6 +--
>  3 files changed, 29 insertions(+), 31 deletions(-)
> 
> diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
> index e2ba68f389..aa073c6e7f 100644
> --- a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
> +++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
> @@ -1,4 +1,4 @@
> -From 68c2a4d7a5d9b46f65121958fdb12d5270bfd1b6 Mon Sep 17 00:00:00 2001
> +From e4df6678e3e2d018acccafd47d1e484887d23323 Mon Sep 17 00:00:00 2001
>  From: Jonathan Stites <mail@jonstites.com>
>  Date: Wed, 6 May 2020 12:55:35 +0000
>  Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag
> @@ -9,6 +9,8 @@ Moves jemalloc behind a feature for musl builds, where it is not
>  supported by the upstream project, so ripgrep will fail to build.
>  
>  Signed-off-by: Sam Voss <sam.voss@gmail.com>
> +[Antoine: update for 14.0.3]
> +Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
>  ---
>   .github/workflows/ci.yml      | 6 ++++++
>   .github/workflows/release.yml | 8 +++++++-
> @@ -18,10 +20,10 @@ Signed-off-by: Sam Voss <sam.voss@gmail.com>
>   5 files changed, 35 insertions(+), 4 deletions(-)
>  
>  diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
> -index ab154ec..aa567d9 100644
> +index b37753e..a2cdeee 100644
>  --- a/.github/workflows/ci.yml
>  +++ b/.github/workflows/ci.yml
> -@@ -149,6 +149,12 @@ jobs:
> +@@ -160,6 +160,12 @@ jobs:
>         if: matrix.target != ''
>         run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }}
>   
> @@ -31,14 +33,14 @@ index ab154ec..aa567d9 100644
>  +      if: matrix.os == 'nightly-musl'
>  +      run: ${{ env.CARGO }} test --verbose --all --features jemalloc ${{ env.TARGET_FLAGS }}
>  +
> -     - name: Test for existence of build artifacts (Windows)
> -       if: matrix.os == 'windows-2019'
> -       shell: bash
> +     - name: Test zsh shell completions (Unix, sans cross)
> +       # We could test this when using Cross, but we'd have to execute the
> +       # 'rg' binary (done in test-complete) with qemu, which is a pain and
>  diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
> -index 7cfb6a4..ad6b82d 100644
> +index b10c076..58a7a12 100644
>  --- a/.github/workflows/release.yml
>  +++ b/.github/workflows/release.yml
> -@@ -133,7 +133,13 @@ jobs:
> +@@ -153,7 +153,13 @@ jobs:
>           echo "target flag is: ${{ env.TARGET_FLAGS }}"
>           echo "target dir is: ${{ env.TARGET_DIR }}"
>   
> @@ -50,25 +52,25 @@ index 7cfb6a4..ad6b82d 100644
>  +
>  +    - name: Build release binary (non-linux)
>  +      if: matrix.build != 'linux'
> -       run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
> - 
> -     - name: Strip release binary (linux and macos)
> +       shell: bash
> +       run: |
> +         ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
>  diff --git a/Cargo.toml b/Cargo.toml
> -index fb78fcb..0d34b1e 100644
> +index f30cc0b..6fe4c79 100644
>  --- a/Cargo.toml
>  +++ b/Cargo.toml
> -@@ -56,8 +56,9 @@ version = "2.33.0"
> - default-features = false
> - features = ["suggestions"]
> +@@ -59,8 +59,9 @@ serde_json = "1.0.23"
> + termcolor = "1.1.0"
> + textwrap = { version = "0.16.0", default-features = false }
>   
>  -[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
>  +[dependencies.jemallocator]
> - version = "0.3.0"
> + version = "0.5.0"
>  +optional = true
>   
> - [build-dependencies]
> - lazy_static = "1.1.0"
> -@@ -75,6 +76,11 @@ walkdir = "2"
> + [dev-dependencies]
> + serde = "1.0.77"
> +@@ -70,6 +71,11 @@ walkdir = "2"
>   [features]
>   simd-accel = ["grep/simd-accel"]
>   pcre2 = ["grep/pcre2"]
> @@ -81,10 +83,10 @@ index fb78fcb..0d34b1e 100644
>   [profile.release]
>   debug = 1
>  diff --git a/README.md b/README.md
> -index 46938bc..9917b29 100644
> +index 63c0725..3d35819 100644
>  --- a/README.md
>  +++ b/README.md
> -@@ -406,6 +406,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
> +@@ -442,6 +442,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
>   `musl-gcc` installed, which might be in a separate package from the actual
>   MUSL library, depending on your Linux distribution.
>   
> @@ -101,10 +103,10 @@ index 46938bc..9917b29 100644
>   ### Running tests
>   
>  diff --git a/crates/core/main.rs b/crates/core/main.rs
> -index 47385de..c9dae5a 100644
> +index 64f35ce..9aa6663 100644
>  --- a/crates/core/main.rs
>  +++ b/crates/core/main.rs
> -@@ -31,7 +31,7 @@ mod subject;
> +@@ -27,7 +27,7 @@ mod search;
>   // have the fastest version of everything. Its goal is to be small and amenable
>   // to static compilation.) Even though ripgrep isn't particularly allocation
>   // heavy, musl's allocator appears to slow down ripgrep quite a bit. Therefore,
> @@ -113,7 +115,7 @@ index 47385de..c9dae5a 100644
>   //
>   // We don't unconditionally use jemalloc because it can be nice to use the
>   // system's default allocator by default. Moreover, jemalloc seems to increase
> -@@ -39,7 +39,11 @@ mod subject;
> +@@ -35,7 +35,11 @@ mod search;
>   //
>   // Moreover, we only do this on 64-bit systems since jemalloc doesn't support
>   // i686.
> @@ -127,5 +129,5 @@ index 47385de..c9dae5a 100644
>   static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
>   
>  -- 
> -2.32.0
> +2.25.1
>  
> diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash
> index 71e74e1bcf..ff86c12ad5 100644
> --- a/package/ripgrep/ripgrep.hash
> +++ b/package/ripgrep/ripgrep.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8  ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz
> +sha256  2f022889c999ffe00955e586fe24b334d1c79060978fc41b95b52a30946e65d0  ripgrep-14.0.3.tar.gz
>  sha256  0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f  LICENSE-MIT
> diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk
> index d587441cfa..44662749bb 100644
> --- a/package/ripgrep/ripgrep.mk
> +++ b/package/ripgrep/ripgrep.mk
> @@ -4,11 +4,7 @@
>  #
>  ################################################################################
>  
> -# Same as 13.0.0, we use a Git commit hash because the hash of this
> -# tarball changed when moving to the cargo-package infrastructure, and
> -# we can't change the hash of existing tarball. Please switch back to
> -# a Git tag at the next version bump.
> -RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5
> +RIPGREP_VERSION = 14.0.3
>  RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION))
>  RIPGREP_LICENSE = MIT
>  RIPGREP_LICENSE_FILES = LICENSE-MIT
> -- 
> 2.25.1
> 
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-31 14:36   ` Yann E. MORIN
@ 2024-01-10 14:22     ` Romain Naour
  2024-01-10 14:29     ` Antoine Coutant
  1 sibling, 0 replies; 15+ messages in thread
From: Romain Naour @ 2024-01-10 14:22 UTC (permalink / raw)
  To: Yann E. MORIN, Antoine Coutant; +Cc: sebastian.weyer, buildroot

Hello Yann,

Le 31/12/2023 à 15:36, Yann E. MORIN a écrit :
> Antoine, All,
> 
> On 2023-12-28 16:26 +0100, Antoine Coutant spake thusly:
>> ripgrep previous version hash is no longer valid.
>> The tarball is modified by rust vendoring so the hash
>> may change with rust versions.
> 
> This was very concerning, and if that had been true, could not have
> been solved just by bumping the version. Indeed, it is not always
> possible to bump the version, e.g. when the package is already using
> the latest version.
> 
> Furthermore, it was a bit surprising that only ripgrep was impacted, not
> all the other cargo-vendored packages. And it turned out that indeed,
> another package was impacted, sentry-cli (but we only have the host
> variant of it).
> 
> So, that really needed more investigations, to provide a more solid
> explanation why the hash was wrong, and if possible identify the point
> in the cargo history where the change happened, to ask upstream if the
> vendoring scheme was stable or not (in that latter case, we'd have had
> to introduce the versioning of the vendored archives).
> 
> However, as you can see in the rest of this thread, the issue has
> nothing to do with cargo vendoring, in fact, and is caused by an
> unrelated change in the download infra (my fault!).
> 
> So, the ripgrep version bump is OK, but not for the correct reasons. ;-)

Thanks for your time spent to look at this issue.

Maybe we should consider merging the patch 3/3 that add a new runtime test
"TestRustVendoring".

Best regards,
Romain


> 
> Regards,
> Yann E. MORIN.
> 
>> The patch has been rebased to ripgrep 14.0.3.
>>
>> Changelog:
>> https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md
>>
>> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
>> ---
>>
>> Tested using qemu_aarch64_virt_defconfig and Arm AArch64 13.2.rel1
>> toolchain.
>>
>> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
>> ---
>>  ...llocator-behind-a-cargo-feature-flag.patch | 52 ++++++++++---------
>>  package/ripgrep/ripgrep.hash                  |  2 +-
>>  package/ripgrep/ripgrep.mk                    |  6 +--
>>  3 files changed, 29 insertions(+), 31 deletions(-)
>>
>> diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
>> index e2ba68f389..aa073c6e7f 100644
>> --- a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
>> +++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
>> @@ -1,4 +1,4 @@
>> -From 68c2a4d7a5d9b46f65121958fdb12d5270bfd1b6 Mon Sep 17 00:00:00 2001
>> +From e4df6678e3e2d018acccafd47d1e484887d23323 Mon Sep 17 00:00:00 2001
>>  From: Jonathan Stites <mail@jonstites.com>
>>  Date: Wed, 6 May 2020 12:55:35 +0000
>>  Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag
>> @@ -9,6 +9,8 @@ Moves jemalloc behind a feature for musl builds, where it is not
>>  supported by the upstream project, so ripgrep will fail to build.
>>  
>>  Signed-off-by: Sam Voss <sam.voss@gmail.com>
>> +[Antoine: update for 14.0.3]
>> +Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr>
>>  ---
>>   .github/workflows/ci.yml      | 6 ++++++
>>   .github/workflows/release.yml | 8 +++++++-
>> @@ -18,10 +20,10 @@ Signed-off-by: Sam Voss <sam.voss@gmail.com>
>>   5 files changed, 35 insertions(+), 4 deletions(-)
>>  
>>  diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
>> -index ab154ec..aa567d9 100644
>> +index b37753e..a2cdeee 100644
>>  --- a/.github/workflows/ci.yml
>>  +++ b/.github/workflows/ci.yml
>> -@@ -149,6 +149,12 @@ jobs:
>> +@@ -160,6 +160,12 @@ jobs:
>>         if: matrix.target != ''
>>         run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }}
>>   
>> @@ -31,14 +33,14 @@ index ab154ec..aa567d9 100644
>>  +      if: matrix.os == 'nightly-musl'
>>  +      run: ${{ env.CARGO }} test --verbose --all --features jemalloc ${{ env.TARGET_FLAGS }}
>>  +
>> -     - name: Test for existence of build artifacts (Windows)
>> -       if: matrix.os == 'windows-2019'
>> -       shell: bash
>> +     - name: Test zsh shell completions (Unix, sans cross)
>> +       # We could test this when using Cross, but we'd have to execute the
>> +       # 'rg' binary (done in test-complete) with qemu, which is a pain and
>>  diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
>> -index 7cfb6a4..ad6b82d 100644
>> +index b10c076..58a7a12 100644
>>  --- a/.github/workflows/release.yml
>>  +++ b/.github/workflows/release.yml
>> -@@ -133,7 +133,13 @@ jobs:
>> +@@ -153,7 +153,13 @@ jobs:
>>           echo "target flag is: ${{ env.TARGET_FLAGS }}"
>>           echo "target dir is: ${{ env.TARGET_DIR }}"
>>   
>> @@ -50,25 +52,25 @@ index 7cfb6a4..ad6b82d 100644
>>  +
>>  +    - name: Build release binary (non-linux)
>>  +      if: matrix.build != 'linux'
>> -       run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
>> - 
>> -     - name: Strip release binary (linux and macos)
>> +       shell: bash
>> +       run: |
>> +         ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
>>  diff --git a/Cargo.toml b/Cargo.toml
>> -index fb78fcb..0d34b1e 100644
>> +index f30cc0b..6fe4c79 100644
>>  --- a/Cargo.toml
>>  +++ b/Cargo.toml
>> -@@ -56,8 +56,9 @@ version = "2.33.0"
>> - default-features = false
>> - features = ["suggestions"]
>> +@@ -59,8 +59,9 @@ serde_json = "1.0.23"
>> + termcolor = "1.1.0"
>> + textwrap = { version = "0.16.0", default-features = false }
>>   
>>  -[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
>>  +[dependencies.jemallocator]
>> - version = "0.3.0"
>> + version = "0.5.0"
>>  +optional = true
>>   
>> - [build-dependencies]
>> - lazy_static = "1.1.0"
>> -@@ -75,6 +76,11 @@ walkdir = "2"
>> + [dev-dependencies]
>> + serde = "1.0.77"
>> +@@ -70,6 +71,11 @@ walkdir = "2"
>>   [features]
>>   simd-accel = ["grep/simd-accel"]
>>   pcre2 = ["grep/pcre2"]
>> @@ -81,10 +83,10 @@ index fb78fcb..0d34b1e 100644
>>   [profile.release]
>>   debug = 1
>>  diff --git a/README.md b/README.md
>> -index 46938bc..9917b29 100644
>> +index 63c0725..3d35819 100644
>>  --- a/README.md
>>  +++ b/README.md
>> -@@ -406,6 +406,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
>> +@@ -442,6 +442,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
>>   `musl-gcc` installed, which might be in a separate package from the actual
>>   MUSL library, depending on your Linux distribution.
>>   
>> @@ -101,10 +103,10 @@ index 46938bc..9917b29 100644
>>   ### Running tests
>>   
>>  diff --git a/crates/core/main.rs b/crates/core/main.rs
>> -index 47385de..c9dae5a 100644
>> +index 64f35ce..9aa6663 100644
>>  --- a/crates/core/main.rs
>>  +++ b/crates/core/main.rs
>> -@@ -31,7 +31,7 @@ mod subject;
>> +@@ -27,7 +27,7 @@ mod search;
>>   // have the fastest version of everything. Its goal is to be small and amenable
>>   // to static compilation.) Even though ripgrep isn't particularly allocation
>>   // heavy, musl's allocator appears to slow down ripgrep quite a bit. Therefore,
>> @@ -113,7 +115,7 @@ index 47385de..c9dae5a 100644
>>   //
>>   // We don't unconditionally use jemalloc because it can be nice to use the
>>   // system's default allocator by default. Moreover, jemalloc seems to increase
>> -@@ -39,7 +39,11 @@ mod subject;
>> +@@ -35,7 +35,11 @@ mod search;
>>   //
>>   // Moreover, we only do this on 64-bit systems since jemalloc doesn't support
>>   // i686.
>> @@ -127,5 +129,5 @@ index 47385de..c9dae5a 100644
>>   static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
>>   
>>  -- 
>> -2.32.0
>> +2.25.1
>>  
>> diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash
>> index 71e74e1bcf..ff86c12ad5 100644
>> --- a/package/ripgrep/ripgrep.hash
>> +++ b/package/ripgrep/ripgrep.hash
>> @@ -1,3 +1,3 @@
>>  # Locally calculated
>> -sha256  6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8  ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz
>> +sha256  2f022889c999ffe00955e586fe24b334d1c79060978fc41b95b52a30946e65d0  ripgrep-14.0.3.tar.gz
>>  sha256  0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f  LICENSE-MIT
>> diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk
>> index d587441cfa..44662749bb 100644
>> --- a/package/ripgrep/ripgrep.mk
>> +++ b/package/ripgrep/ripgrep.mk
>> @@ -4,11 +4,7 @@
>>  #
>>  ################################################################################
>>  
>> -# Same as 13.0.0, we use a Git commit hash because the hash of this
>> -# tarball changed when moving to the cargo-package infrastructure, and
>> -# we can't change the hash of existing tarball. Please switch back to
>> -# a Git tag at the next version bump.
>> -RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5
>> +RIPGREP_VERSION = 14.0.3
>>  RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION))
>>  RIPGREP_LICENSE = MIT
>>  RIPGREP_LICENSE_FILES = LICENSE-MIT
>> -- 
>> 2.25.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
> 

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2023-12-31 14:36   ` Yann E. MORIN
  2024-01-10 14:22     ` Romain Naour
@ 2024-01-10 14:29     ` Antoine Coutant
  2024-01-10 20:27       ` Yann E. MORIN
  1 sibling, 1 reply; 15+ messages in thread
From: Antoine Coutant @ 2024-01-10 14:29 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: romain.naour, sebastian.weyer, buildroot


[-- Attachment #1.1: Type: text/plain, Size: 9388 bytes --]

Yann, All,


On 31/12/2023 15:36, Yann E. MORIN wrote:
> Antoine, All,
>
> On 2023-12-28 16:26 +0100, Antoine Coutant spake thusly:
>> ripgrep previous version hash is no longer valid.
>> The tarball is modified by rust vendoring so the hash
>> may change with rust versions.
> This was very concerning, and if that had been true, could not have
> been solved just by bumping the version. Indeed, it is not always
> possible to bump the version, e.g. when the package is already using
> the latest version.
>
> Furthermore, it was a bit surprising that only ripgrep was impacted, not
> all the other cargo-vendored packages. And it turned out that indeed,
> another package was impacted, sentry-cli (but we only have the host
> variant of it).
>
> So, that really needed more investigations, to provide a more solid
> explanation why the hash was wrong, and if possible identify the point
> in the cargo history where the change happened, to ask upstream if the
> vendoring scheme was stable or not (in that latter case, we'd have had
> to introduce the versioning of the vendored archives).
>
> However, as you can see in the rest of this thread, the issue has
> nothing to do with cargo vendoring, in fact, and is caused by an
> unrelated change in the download infra (my fault!).

I'm sorry for the confusion I caused by my misunderstanding.

Thanks for all your research!


Regards,

Antoine Coutant

>
> So, the ripgrep version bump is OK, but not for the correct reasons. ;-)
>
> Regards,
> Yann E. MORIN.
>
>> The patch has been rebased to ripgrep 14.0.3.
>>
>> Changelog:
>> https://github.com/BurntSushi/ripgrep/blob/master/CHANGELOG.md
>>
>> Signed-off-by: Antoine Coutant<antoine.coutant@smile.fr>
>> ---
>>
>> Tested using qemu_aarch64_virt_defconfig and Arm AArch64 13.2.rel1
>> toolchain.
>>
>> Signed-off-by: Antoine Coutant<antoine.coutant@smile.fr>
>> ---
>>   ...llocator-behind-a-cargo-feature-flag.patch | 52 ++++++++++---------
>>   package/ripgrep/ripgrep.hash                  |  2 +-
>>   package/ripgrep/ripgrep.mk                    |  6 +--
>>   3 files changed, 29 insertions(+), 31 deletions(-)
>>
>> diff --git a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
>> index e2ba68f389..aa073c6e7f 100644
>> --- a/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
>> +++ b/package/ripgrep/0001-puts-jemalloc-allocator-behind-a-cargo-feature-flag.patch
>> @@ -1,4 +1,4 @@
>> -From 68c2a4d7a5d9b46f65121958fdb12d5270bfd1b6 Mon Sep 17 00:00:00 2001
>> +From e4df6678e3e2d018acccafd47d1e484887d23323 Mon Sep 17 00:00:00 2001
>>   From: Jonathan Stites<mail@jonstites.com>
>>   Date: Wed, 6 May 2020 12:55:35 +0000
>>   Subject: [PATCH] puts jemalloc allocator behind a cargo feature flag
>> @@ -9,6 +9,8 @@ Moves jemalloc behind a feature for musl builds, where it is not
>>   supported by the upstream project, so ripgrep will fail to build.
>>   
>>   Signed-off-by: Sam Voss<sam.voss@gmail.com>
>> +[Antoine: update for 14.0.3]
>> +Signed-off-by: Antoine Coutant<antoine.coutant@smile.fr>
>>   ---
>>    .github/workflows/ci.yml      | 6 ++++++
>>    .github/workflows/release.yml | 8 +++++++-
>> @@ -18,10 +20,10 @@ Signed-off-by: Sam Voss<sam.voss@gmail.com>
>>    5 files changed, 35 insertions(+), 4 deletions(-)
>>   
>>   diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
>> -index ab154ec..aa567d9 100644
>> +index b37753e..a2cdeee 100644
>>   --- a/.github/workflows/ci.yml
>>   +++ b/.github/workflows/ci.yml
>> -@@ -149,6 +149,12 @@ jobs:
>> +@@ -160,6 +160,12 @@ jobs:
>>          if: matrix.target != ''
>>          run: ${{ env.CARGO }} test --verbose --workspace ${{ env.TARGET_FLAGS }}
>>    
>> @@ -31,14 +33,14 @@ index ab154ec..aa567d9 100644
>>   +      if: matrix.os == 'nightly-musl'
>>   +      run: ${{ env.CARGO }} test --verbose --all --features jemalloc ${{ env.TARGET_FLAGS }}
>>   +
>> -     - name: Test for existence of build artifacts (Windows)
>> -       if: matrix.os == 'windows-2019'
>> -       shell: bash
>> +     - name: Test zsh shell completions (Unix, sans cross)
>> +       # We could test this when using Cross, but we'd have to execute the
>> +       # 'rg' binary (done in test-complete) with qemu, which is a pain and
>>   diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
>> -index 7cfb6a4..ad6b82d 100644
>> +index b10c076..58a7a12 100644
>>   --- a/.github/workflows/release.yml
>>   +++ b/.github/workflows/release.yml
>> -@@ -133,7 +133,13 @@ jobs:
>> +@@ -153,7 +153,13 @@ jobs:
>>            echo "target flag is: ${{ env.TARGET_FLAGS }}"
>>            echo "target dir is: ${{ env.TARGET_DIR }}"
>>    
>> @@ -50,25 +52,25 @@ index 7cfb6a4..ad6b82d 100644
>>   +
>>   +    - name: Build release binary (non-linux)
>>   +      if: matrix.build != 'linux'
>> -       run: ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
>> -
>> -     - name: Strip release binary (linux and macos)
>> +       shell: bash
>> +       run: |
>> +         ${{ env.CARGO }} build --verbose --release --features pcre2 ${{ env.TARGET_FLAGS }}
>>   diff --git a/Cargo.toml b/Cargo.toml
>> -index fb78fcb..0d34b1e 100644
>> +index f30cc0b..6fe4c79 100644
>>   --- a/Cargo.toml
>>   +++ b/Cargo.toml
>> -@@ -56,8 +56,9 @@ version = "2.33.0"
>> - default-features = false
>> - features = ["suggestions"]
>> +@@ -59,8 +59,9 @@ serde_json = "1.0.23"
>> + termcolor = "1.1.0"
>> + textwrap = { version = "0.16.0", default-features = false }
>>    
>>   -[target.'cfg(all(target_env = "musl", target_pointer_width = "64"))'.dependencies.jemallocator]
>>   +[dependencies.jemallocator]
>> - version = "0.3.0"
>> + version = "0.5.0"
>>   +optional = true
>>    
>> - [build-dependencies]
>> - lazy_static = "1.1.0"
>> -@@ -75,6 +76,11 @@ walkdir = "2"
>> + [dev-dependencies]
>> + serde = "1.0.77"
>> +@@ -70,6 +71,11 @@ walkdir = "2"
>>    [features]
>>    simd-accel = ["grep/simd-accel"]
>>    pcre2 = ["grep/pcre2"]
>> @@ -81,10 +83,10 @@ index fb78fcb..0d34b1e 100644
>>    [profile.release]
>>    debug = 1
>>   diff --git a/README.md b/README.md
>> -index 46938bc..9917b29 100644
>> +index 63c0725..3d35819 100644
>>   --- a/README.md
>>   +++ b/README.md
>> -@@ -406,6 +406,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
>> +@@ -442,6 +442,15 @@ build a static executable with MUSL and with PCRE2, then you will need to have
>>    `musl-gcc` installed, which might be in a separate package from the actual
>>    MUSL library, depending on your Linux distribution.
>>    
>> @@ -101,10 +103,10 @@ index 46938bc..9917b29 100644
>>    ### Running tests
>>    
>>   diff --git a/crates/core/main.rs b/crates/core/main.rs
>> -index 47385de..c9dae5a 100644
>> +index 64f35ce..9aa6663 100644
>>   --- a/crates/core/main.rs
>>   +++ b/crates/core/main.rs
>> -@@ -31,7 +31,7 @@ mod subject;
>> +@@ -27,7 +27,7 @@ mod search;
>>    // have the fastest version of everything. Its goal is to be small and amenable
>>    // to static compilation.) Even though ripgrep isn't particularly allocation
>>    // heavy, musl's allocator appears to slow down ripgrep quite a bit. Therefore,
>> @@ -113,7 +115,7 @@ index 47385de..c9dae5a 100644
>>    //
>>    // We don't unconditionally use jemalloc because it can be nice to use the
>>    // system's default allocator by default. Moreover, jemalloc seems to increase
>> -@@ -39,7 +39,11 @@ mod subject;
>> +@@ -35,7 +35,11 @@ mod search;
>>    //
>>    // Moreover, we only do this on 64-bit systems since jemalloc doesn't support
>>    // i686.
>> @@ -127,5 +129,5 @@ index 47385de..c9dae5a 100644
>>    static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
>>    
>>   --
>> -2.32.0
>> +2.25.1
>>   
>> diff --git a/package/ripgrep/ripgrep.hash b/package/ripgrep/ripgrep.hash
>> index 71e74e1bcf..ff86c12ad5 100644
>> --- a/package/ripgrep/ripgrep.hash
>> +++ b/package/ripgrep/ripgrep.hash
>> @@ -1,3 +1,3 @@
>>   # Locally calculated
>> -sha256  6f1d4a8b653ce48d59ad777288b1257cbda607db29db19d031b7e622c60526f8  ripgrep-af6b6c543b224d348a8876f0c06245d9ea7929c5.tar.gz
>> +sha256  2f022889c999ffe00955e586fe24b334d1c79060978fc41b95b52a30946e65d0  ripgrep-14.0.3.tar.gz
>>   sha256  0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f  LICENSE-MIT
>> diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk
>> index d587441cfa..44662749bb 100644
>> --- a/package/ripgrep/ripgrep.mk
>> +++ b/package/ripgrep/ripgrep.mk
>> @@ -4,11 +4,7 @@
>>   #
>>   ################################################################################
>>   
>> -# Same as 13.0.0, we use a Git commit hash because the hash of this
>> -# tarball changed when moving to the cargo-package infrastructure, and
>> -# we can't change the hash of existing tarball. Please switch back to
>> -# a Git tag at the next version bump.
>> -RIPGREP_VERSION = af6b6c543b224d348a8876f0c06245d9ea7929c5
>> +RIPGREP_VERSION = 14.0.3
>>   RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION))
>>   RIPGREP_LICENSE = MIT
>>   RIPGREP_LICENSE_FILES = LICENSE-MIT
>> -- 
>> 2.25.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot

[-- Attachment #1.2: Type: text/html, Size: 11989 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3
  2024-01-10 14:29     ` Antoine Coutant
@ 2024-01-10 20:27       ` Yann E. MORIN
  0 siblings, 0 replies; 15+ messages in thread
From: Yann E. MORIN @ 2024-01-10 20:27 UTC (permalink / raw)
  To: Antoine Coutant; +Cc: romain.naour, sebastian.weyer, buildroot

Antoine, All,

On 2024-01-10 15:29 +0100, Antoine Coutant spake thusly:
> On 31/12/2023 15:36, Yann E. MORIN wrote:
> > On 2023-12-28 16:26 +0100, Antoine Coutant spake thusly:
> > > ripgrep previous version hash is no longer valid.
> > > The tarball is modified by rust vendoring so the hash
> > > may change with rust versions.
[--SNIP--]
> > However, as you can see in the rest of this thread, the issue has
> > nothing to do with cargo vendoring, in fact, and is caused by an
> > unrelated change in the download infra (my fault!).
> I'm sorry for the confusion I caused by my misunderstanding.
> Thanks for all your research!

Don't worry about it. I got to identify one of my screw-ups, so that's
fine!

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-01-10 20:28 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-28 15:26 [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1 Antoine Coutant
2023-12-28 15:26 ` [Buildroot] [PATCH v2 2/3] package/ripgrep: bump to version 14.0.3 Antoine Coutant
2023-12-29 22:13   ` Yann E. MORIN
2023-12-30 18:00     ` Thomas Petazzoni via buildroot
2023-12-30 19:44       ` Yann E. MORIN
2023-12-30 22:08         ` Yann E. MORIN
2023-12-31  9:25         ` Yann E. MORIN
2023-12-31 11:01           ` Yann E. MORIN
2023-12-31 14:25             ` Yann E. MORIN
2023-12-31 14:36   ` Yann E. MORIN
2024-01-10 14:22     ` Romain Naour
2024-01-10 14:29     ` Antoine Coutant
2024-01-10 20:27       ` Yann E. MORIN
2023-12-28 15:26 ` [Buildroot] [PATCH v2 3/3] support/testing: test_rust.py: Add test to check correct vendoring Antoine Coutant
2023-12-30 18:01 ` [Buildroot] [PATCH v2 1/3] package/{rust, rust-bin}: bump to version 1.74.1 Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox