Skip to content

Commit b751a7b

Browse files
jolivainRomainNaour
authored andcommitted
package/poke: fix patch fuzz
Commit 8f88a64 "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 <[email protected]> Signed-off-by: Romain Naour <[email protected]>
1 parent 3b3cb4e commit b751a7b

3 files changed

+15
-11
lines changed

.checkpackageignore

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

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 51fb81264323f01a86dd0bdeaf1c7a044a9cb6dc Mon Sep 17 00:00:00 2001
1+
From a7e29f73dab5f9bd4fc7a2407f1ed2022c4ff109 Mon Sep 17 00:00:00 2001
22
From: Romain Naour <[email protected]>
33
Date: Fri, 30 Apr 2021 15:43:59 +0200
44
Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when
@@ -12,23 +12,25 @@ Avoid:
1212
../run: line 51: exec: :: not found
1313

1414
Signed-off-by: Romain Naour <[email protected]>
15+
[Julien: refreshed the patch to be applied with fuzz factor 0]
16+
Signed-off-by: Julien Olivain <[email protected]>
1517
---
1618
configure.ac | 2 +-
1719
1 file changed, 1 insertion(+), 1 deletion(-)
1820

1921
diff --git a/configure.ac b/configure.ac
20-
index a1943b57..c633f719 100644
22+
index 71b4d86..6487b57 100644
2123
--- a/configure.ac
2224
+++ b/configure.ac
23-
@@ -90,7 +90,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
25+
@@ -88,7 +88,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
2426
if test $cross_compiling = no; then
2527
AM_MISSING_PROG(HELP2MAN, help2man)
2628
else
2729
- HELP2MAN=:
2830
+ HELP2MAN=true
2931
fi
3032

31-
dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to
33+
dnl The following Automake conditional is used in some Makefile.am files
3234
--
33-
2.31.1
35+
2.45.2
3436

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

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 236b019b83228d2e37fa07635fb6864ed7dc5fad Mon Sep 17 00:00:00 2001
1+
From 09758ebb191da659563b4c33334295ce21ecae71 Mon Sep 17 00:00:00 2001
22
From: Fabrice Fontaine <[email protected]>
33
Date: Thu, 1 Apr 2021 07:49:46 +0200
44
Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35
@@ -25,14 +25,17 @@ Fixes:
2525
- http://autobuild.buildroot.org/results/30105094e39374ec6d4e47e2fb5e99696f7f7981
2626

2727
Signed-off-by: Fabrice Fontaine <[email protected]>
28+
Upstream: Not applicable (Buildroot specific)
29+
[Julien: refreshed the patch to be applied with fuzz factor 0]
30+
Signed-off-by: Julien Olivain <[email protected]>
2831
---
2932
gl-libpoke/getrandom.c | 1 +
3033
gl/getrandom.c | 1 +
3134
jitter/gnulib-local/getrandom.c | 1 +
3235
3 files changed, 3 insertions(+)
3336

3437
diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c
35-
index e146873..3948d8d 100644
38+
index 19bb342..0251e0f 100644
3639
--- a/gl-libpoke/getrandom.c
3740
+++ b/gl-libpoke/getrandom.c
3841
@@ -19,6 +19,7 @@
@@ -44,7 +47,7 @@ index e146873..3948d8d 100644
4447

4548
#include <errno.h>
4649
diff --git a/gl/getrandom.c b/gl/getrandom.c
47-
index e146873..3948d8d 100644
50+
index 19bb342..0251e0f 100644
4851
--- a/gl/getrandom.c
4952
+++ b/gl/getrandom.c
5053
@@ -19,6 +19,7 @@
@@ -56,7 +59,7 @@ index e146873..3948d8d 100644
5659

5760
#include <errno.h>
5861
diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c
59-
index e146873..3948d8d 100644
62+
index 19bb342..0251e0f 100644
6063
--- a/jitter/gnulib-local/getrandom.c
6164
+++ b/jitter/gnulib-local/getrandom.c
6265
@@ -19,6 +19,7 @@
@@ -68,5 +71,5 @@ index e146873..3948d8d 100644
6871

6972
#include <errno.h>
7073
--
71-
2.31.1
74+
2.45.2
7275

0 commit comments

Comments
 (0)