All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dario Binacchi <dario.binacchi@amarulasolutions.com>
To: buildroot@buildroot.org
Cc: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Subject: [Buildroot] [PATCH 1/1] package/nushell: update the patches to be applied with fuzz 0
Date: Sun,  7 Jul 2024 08:10:24 +0200	[thread overview]
Message-ID: <20240707061024.3850928-1-dario.binacchi@amarulasolutions.com> (raw)

Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.

Due to this change, nushell fails to build with output:

    Applying 0001-uucore-add-support-for-sparc64.patch using patch:
    patching file VENDOR/uucore/src/lib/features/fs.rs
    Hunk #1 FAILED at 121.
    Hunk #2 FAILED at 137.
    2 out of 2 hunks FAILED -- saving rejects to file VENDOR/uucore/src/lib/features/fs.rs.rej

This commit refreshes the package patch on the current package version.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .../nushell/0001-uucore-add-support-for-sparc64.patch  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/nushell/0001-uucore-add-support-for-sparc64.patch b/package/nushell/0001-uucore-add-support-for-sparc64.patch
index 2cc05c172ede..ad7e70a56d63 100644
--- a/package/nushell/0001-uucore-add-support-for-sparc64.patch
+++ b/package/nushell/0001-uucore-add-support-for-sparc64.patch
@@ -28,6 +28,8 @@ Fixes:
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 Upstream: https://github.com/uutils/coreutils/commit/d158f1a396d19cc2aed68131b80ec3b7325d108e
+[Dario: make the patch to be applied with fuzz factor 0]
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
 ---
  src/uucore/src/lib/features/fs.rs | 2 ++
  1 file changed, 2 insertions(+)
@@ -36,16 +38,16 @@ diff --git a/VENDOR/uucore/src/lib/features/fs.rs b/VENDOR/uucore/src/lib/featur
 index 20cc9e13d..3b9170bc3 100644
 --- a/VENDOR/uucore/src/lib/features/fs.rs
 +++ b/VENDOR/uucore/src/lib/features/fs.rs
-@@ -121,6 +121,7 @@ impl FileInformation {
-             not(target_os = "solaris"),
+@@ -116,6 +116,7 @@
+             not(target_os = "freebsd"),
              not(target_arch = "aarch64"),
              not(target_arch = "riscv64"),
 +            not(target_arch = "sparc64"),
              target_pointer_width = "64"
          ))]
          return self.0.st_nlink;
-@@ -137,6 +138,7 @@ impl FileInformation {
-                 target_os = "solaris",
+@@ -127,6 +128,7 @@
+                 target_os = "freebsd",
                  target_arch = "aarch64",
                  target_arch = "riscv64",
 +                target_arch = "sparc64",
-- 
2.43.0

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

             reply	other threads:[~2024-07-07  6:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-07  6:10 Dario Binacchi [this message]
2024-07-08 20:21 ` [Buildroot] [PATCH 1/1] package/nushell: update the patches to be applied with fuzz 0 Thomas Petazzoni via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240707061024.3850928-1-dario.binacchi@amarulasolutions.com \
    --to=dario.binacchi@amarulasolutions.com \
    --cc=buildroot@buildroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.