[Buildroot] [PATCH 1/1] package/rt-tests: fix patch fuzz

* [Buildroot] [PATCH 1/1] package/rt-tests: fix patch fuzz
@ 2024-07-01 17:03 Julien Olivain
  2024-07-01 20:50 ` Yann E. MORIN
  0 siblings, 1 reply; 2+ messages in thread
From: Julien Olivain @ 2024-07-01 17:03 UTC (permalink / raw)
  To: buildroot; +Cc: Julien Olivain, Thomas Petazzoni

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

Due to this change, rt-tests fails to build with output:

    Applying 0001-Fix-a-build-issue-with-uClibc-ng.patch using patch:
    patching file src/cyclictest/cyclictest.c
    Hunk #1 FAILED at 58.
    1 out of 1 hunk FAILED -- saving rejects to file src/cyclictest/cyclictest.c.rej

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

The patch 0002 had an "Upstream:" tag in brackets. The tag was not
detected as such by check-package. This commit removes those brackets
and also removes the ".checkpackageignore" entry.

Fixes:
http://autobuild.buildroot.org/results/3e0a3b8d8c42d8e82ecf47b80bca875de739af5b

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 .checkpackageignore                                |  1 -
 .../0001-Fix-a-build-issue-with-uClibc-ng.patch    | 12 +++++++-----
 ...op-explicit-undefine-PYLIB-for-compatibil.patch | 14 ++++++++------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.checkpackageignore b/.checkpackageignore
index c73e0433b12..a122f74bb8c 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1325,7 +1325,6 @@ package/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch lib_patc
 package/rpi-userland/0006-interface-vcos-pthreads-CMakeLists.txt-fix-build-wit.patch lib_patch.Upstream
 package/rpi-userland/0007-GLES2-gl2ext.h-add-GLint64-GLuint64-and-GLsync-typed.patch lib_patch.Upstream
 package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch lib_patch.Upstream
-package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch lib_patch.Upstream
 package/rtmpdump/0001-include-limits.h.patch lib_patch.Upstream
 package/rtorrent/0001-Added--disable-execinfo-option-to-configure.patch lib_patch.Upstream
 package/rtty/0001-CMakeLists.txt-prefer-pkg_check_modules.patch lib_patch.Upstream
diff --git a/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch b/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch
index 785d93c9be0..ae89761ecde 100644
--- a/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch
+++ b/package/rt-tests/0001-Fix-a-build-issue-with-uClibc-ng.patch
@@ -1,4 +1,4 @@
-From 21e0c16a85c2e028a963703511d750d1751bc254 Mon Sep 17 00:00:00 2001
+From a621d8ee2a27ba44845f5232a3b2bf9b581623b1 Mon Sep 17 00:00:00 2001
 From: Alexey Brodkin <abrodkin@synopsys.com>
 Date: Wed, 13 Jul 2016 23:46:38 +0200
 Subject: [PATCH] Fix a build issue with uClibc-ng
@@ -11,16 +11,18 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
     rebase on v1.0
     remove uClibc legacy support, uClibc-ng provide utmpx.h]
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Julien: rebased patch on version 2.7]
+Signed-off-by: Julien Olivain <ju.o@free.fr>
 ---
  src/cyclictest/cyclictest.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
-index 00e5f3d..92fa3dd 100644
+index c5c3389..5ae1dd9 100644
 --- a/src/cyclictest/cyclictest.c
 +++ b/src/cyclictest/cyclictest.c
-@@ -58,7 +58,7 @@
- #define gettid() syscall(__NR_gettid)
+@@ -51,7 +51,7 @@
+ 
  #define sigev_notify_thread_id _sigev_un._tid
  
 -#ifdef __UCLIBC__
@@ -29,5 +31,5 @@ index 00e5f3d..92fa3dd 100644
  	((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
  #define CPUCLOCK_SCHED          2
 -- 
-2.5.5
+2.45.2
 
diff --git a/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch b/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch
index f71ba09a791..9212b8eee07 100644
--- a/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch
+++ b/package/rt-tests/0002-Makefile-drop-explicit-undefine-PYLIB-for-compatibil.patch
@@ -1,4 +1,4 @@
-From 84fea5d784e010f84c860b34e55ea2c855c17b3b Mon Sep 17 00:00:00 2001
+From 063972eece2fb8157f0feb98a4608c2984c7c5ff Mon Sep 17 00:00:00 2001
 From: Peter Korsgaard <peter@korsgaard.com>
 Date: Wed, 12 May 2021 09:18:33 +0200
 Subject: [PATCH] Makefile: drop explicit undefine PYLIB for compatibility with
@@ -22,18 +22,20 @@ Fixes:
 http://autobuild.buildroot.net/results/cf7c4f360f5464c700788cc8299fd086544c80e8/build-end.log
 
 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-[Upstream: https://marc.info/?l=linux-rt-users&m=162080462211139&w=2]
+Upstream: https://marc.info/?l=linux-rt-users&m=162080462211139&w=2
+[Julien: rebased patch on version 2.7]
+Signed-off-by: Julien Olivain <ju.o@free.fr>
 ---
  Makefile | 5 -----
  1 file changed, 5 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index b17ac09..ec85ac8 100644
+index e2f8579..62c906f 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -36,11 +36,6 @@ LDFLAGS ?=
+@@ -37,11 +37,6 @@ LDFLAGS ?=
  
- PYLIB  ?= $(shell python3 -c 'import distutils.sysconfig;  print (distutils.sysconfig.get_python_lib())')
+ PYLIB ?= $(shell python3 -m get_pylib)
  
 -# Check for errors, such as python3 not available
 -ifeq (${PYLIB},)
@@ -44,5 +46,5 @@ index b17ac09..ec85ac8 100644
  	   src/pi_tests/pi_stress.8 \
  	   src/ptsematest/ptsematest.8 \
 -- 
-2.20.1
+2.45.2
 
-- 
2.45.2

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread