| Message ID | 20240705102226.3283175-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hello Dario, Le 05/07/2024 à 12:22, Dario Binacchi a écrit : > Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum > fuzz factor to 0") reduced the fuzz factor. > > Due to this change, udpcast fails to build with output: > > Applying 0001-fix-musl-build.patch using patch: > patching file receivedata.c > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- saving rejects to file receivedata.c.rej > > This commit refreshes the package patch on the current package version. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> Applied to master, thanks. Best regards, Romain > --- > .checkpackageignore | 1 - > package/udpcast/0001-fix-musl-build.patch | 7 ++++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/.checkpackageignore b/.checkpackageignore > index 0a1d2627455e..a0480550b9e6 100644 > --- a/.checkpackageignore > +++ b/.checkpackageignore > @@ -1456,7 +1456,6 @@ package/uboot-tools/0001-drop-configh-from-tools.patch lib_patch.Upstream > package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch lib_patch.Upstream > package/uboot-tools/0003-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch lib_patch.Upstream > package/ubus/0001-Install-server-and-client-examples.patch lib_patch.Upstream > -package/udpcast/0001-fix-musl-build.patch lib_patch.Upstream > package/uemacs/01-clear-ixon-termios-flag.patch lib_patch.Upstream > package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch lib_patch.Upstream > package/uhttpd/0001-Remove-Werror.patch lib_patch.Upstream > diff --git a/package/udpcast/0001-fix-musl-build.patch b/package/udpcast/0001-fix-musl-build.patch > index 0e213b279344..e24f3e9e940b 100644 > --- a/package/udpcast/0001-fix-musl-build.patch > +++ b/package/udpcast/0001-fix-musl-build.patch > @@ -15,8 +15,9 @@ Fixes: > - http://autobuild.buildroot.org/results/30208c6f175967fed6de690447a09e0c86547b24 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > -[Upstream status: > -https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/] > +Upstream: https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/ > +[Dario: make the patch to be applied with fuzz factor 0] > +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > > diff '--color=auto' -Nura udpcast-20211207.orig/receivedata.c udpcast-20211207/receivedata.c > --- udpcast-20211207.orig/receivedata.c 2022-08-13 21:48:06.226588614 +0200 > @@ -27,5 +28,5 @@ diff '--color=auto' -Nura udpcast-20211207.orig/receivedata.c udpcast-20211207/r > #include <unistd.h> > +#include <stddef.h> > #include <stdlib.h> > - #include <sys/time.h> > #include <errno.h> > + To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff --git a/.checkpackageignore b/.checkpackageignore index 0a1d2627455e..a0480550b9e6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1456,7 +1456,6 @@ package/uboot-tools/0001-drop-configh-from-tools.patch lib_patch.Upstream package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch lib_patch.Upstream package/uboot-tools/0003-tools-Makefile-fix-C-LD-FLAGS-with-CROSS_BUILD_TOOLS.patch lib_patch.Upstream package/ubus/0001-Install-server-and-client-examples.patch lib_patch.Upstream -package/udpcast/0001-fix-musl-build.patch lib_patch.Upstream package/uemacs/01-clear-ixon-termios-flag.patch lib_patch.Upstream package/uhd/0001-host-CMakeLists-add-boost-unit_test_framework-requir.patch lib_patch.Upstream package/uhttpd/0001-Remove-Werror.patch lib_patch.Upstream diff --git a/package/udpcast/0001-fix-musl-build.patch b/package/udpcast/0001-fix-musl-build.patch index 0e213b279344..e24f3e9e940b 100644 --- a/package/udpcast/0001-fix-musl-build.patch +++ b/package/udpcast/0001-fix-musl-build.patch @@ -15,8 +15,9 @@ Fixes: - http://autobuild.buildroot.org/results/30208c6f175967fed6de690447a09e0c86547b24 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> -[Upstream status: -https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/] +Upstream: https://udpcast.linux.lu/mailman3/hyperkitty/list/udpcast@udpcast.linux.lu/thread/4MBES2CPUSUNIZTC7NXCQYS2GAE4DQSG/ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> diff '--color=auto' -Nura udpcast-20211207.orig/receivedata.c udpcast-20211207/receivedata.c --- udpcast-20211207.orig/receivedata.c 2022-08-13 21:48:06.226588614 +0200 @@ -27,5 +28,5 @@ diff '--color=auto' -Nura udpcast-20211207.orig/receivedata.c udpcast-20211207/r #include <unistd.h> +#include <stddef.h> #include <stdlib.h> - #include <sys/time.h> #include <errno.h> +
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, udpcast fails to build with output: Applying 0001-fix-musl-build.patch using patch: patching file receivedata.c Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file receivedata.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- .checkpackageignore | 1 - package/udpcast/0001-fix-musl-build.patch | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-)