mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 07:51:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/poke: fix patch fuzz

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

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

    Applying 0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch using patch:
    patching file configure.ac
    Hunk #1 FAILED at 90.
    1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej

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

The patch 0002 was described as specific to Buildroot. This commit
adds the "Upstream:" tag and removes the corresponding
".checkpackageignore" entry.

Fixes:
http://autobuild.buildroot.org/results/ace4a0efffb66dcebf873a2baa33b5edfe670093

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Julien Olivain
2024-07-03 00:04:11 +02:00
committed by Romain Naour
parent 3b3cb4e5a7
commit b751a7b90f
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@@ -1207,7 +1207,6 @@ package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch li
package/pkgconf/0002-Revert-main-assume-modversion-insted-of-version-if-o.patch lib_patch.Upstream
package/pkgconf/pkg-config.in Shellcheck
package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch lib_patch.Upstream
package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream
package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch lib_patch.Upstream
package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch lib_patch.Upstream
package/postgresql/S50postgresql lib_sysv.Variables

12
package/poke/0001-configure.ac-HELP2MAN-replace-by-true-when-cross-com.patch
View File

@@ -1,4 +1,4 @@
From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001
From a7e29f73dab5f9bd4fc7a2407f1ed2022c4ff109 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Fri, 30 Apr 2021 15:43:59 +0200
Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when
@@ -12,15 +12,17 @@ Avoid:
../run: line 51: exec: :: not found
Signed-off-by: Romain Naour <romain.naour@gmail.com>
[Julien: refreshed the patch to be applied with fuzz factor 0]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a1943b57..c633f719 100644
index 71b4d86..6487b57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
@@ -88,7 +88,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
if test $cross_compiling = no; then
AM_MISSING_PROG(HELP2MAN, help2man)
else
@@ -28,7 +30,7 @@ index a1943b57..c633f719 100644
+ HELP2MAN=true
fi
dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to
dnl The following Automake conditional is used in some Makefile.am files
--
2.31.1
2.45.2

13
package/poke/0002-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch
View File

@@ -1,4 +1,4 @@
From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001
From 09758ebb191da659563b4c33334295ce21ecae71 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 1 Apr 2021 07:49:46 +0200
Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35
@@ -25,6 +25,9 @@ Fixes:
- http://autobuild.buildroot.org/results/30105094e39374ec6d4e47e2fb5e99696f7f7981
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Upstream: Not applicable (Buildroot specific)
[Julien: refreshed the patch to be applied with fuzz factor 0]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
gl-libpoke/getrandom.c | 1 +
gl/getrandom.c | 1 +
@@ -32,7 +35,7 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3 files changed, 3 insertions(+)
diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c
index e146873..3948d8d 100644
index 19bb342..0251e0f 100644
--- a/gl-libpoke/getrandom.c
+++ b/gl-libpoke/getrandom.c
@@ -19,6 +19,7 @@
@@ -44,7 +47,7 @@ index e146873..3948d8d 100644
#include <errno.h>
diff --git a/gl/getrandom.c b/gl/getrandom.c
index e146873..3948d8d 100644
index 19bb342..0251e0f 100644
--- a/gl/getrandom.c
+++ b/gl/getrandom.c
@@ -19,6 +19,7 @@
@@ -56,7 +59,7 @@ index e146873..3948d8d 100644
#include <errno.h>
diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c
index e146873..3948d8d 100644
index 19bb342..0251e0f 100644
--- a/jitter/gnulib-local/getrandom.c
+++ b/jitter/gnulib-local/getrandom.c
@@ -19,6 +19,7 @@
@@ -68,5 +71,5 @@ index e146873..3948d8d 100644
#include <errno.h>
--
2.31.1
2.45.2