Skip to contentSkip to conversation

package/libblockdev: fix patch fuzz

PATCH Applied James Hilliard 2 participants 2 messages Jul 2, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libblockdev: fix patch fuzz

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

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

Applying 0001-Provide-replacement-function-for-strerror_l.patch using patch:
patching file configure.ac
patching file src/utils/module.c
Hunk #1 FAILED at 28.

This commit fixes the Provide replacement function for strerror_l() patch so that it applies.

Fixes:
http://autobuild.buildroot.net/results/df5/df54118cc7057ba8dd566515281b77c49a596a04

---
 .../0001-Provide-replacement-function-for-strerror_l.patch      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +1 -1
index f7f75c9c14..d073e16ac5 100644
@@ -41,8 +41,8 @@ index 6557c3ab..5893f0ac 100644
  #include "logging.h"
 +#include "utils.h"
  
- #define UNUSED __attribute__((unused))
  
+ /**
 diff --git a/src/utils/utils.h b/src/utils/utils.h
 index 801a8b6e..b2bdf0d0 100644
 --- a/src/utils/utils.h
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 10 lines · James Hilliard

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

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

Applying 0001-Provide-replacement-function-for-strerror_l.patch using patch:
patching file configure.ac
patching file src/utils/module.c
Hunk #1 FAILED at 28.

Quoted 7 lines

This commit fixes the Provide replacement function for strerror_l() patch so that it applies.

Fixes:
http://autobuild.buildroot.net/results/df5/df54118cc7057ba8dd566515281b77c49a596a04

Applied to master, thanks.

Regards,
Arnout

Quoted 9 lines
---
  .../0001-Provide-replacement-function-for-strerror_l.patch      | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +0 -0
index f7f75c9c14..d073e16ac5 100644

package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch index 6557c3ab..5893f0ac 100644 · line 48

Quoted 9 lines
package/libblockdev/0001-Provide-replacement-function-for-strerror_l.patch +1 -1
@@ -41,8 +41,8 @@ index 6557c3ab..5893f0ac 100644
   #include "logging.h"
  +#include "utils.h"
 
- #define UNUSED __attribute__((unused))
 
+ /**
  diff --git a/src/utils/utils.h b/src/utils/utils.h
  index 801a8b6e..b2bdf0d0 100644
  --- a/src/utils/utils.h

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot