| Message ID | 20240704185641.2974800-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On Thu, 4 Jul 2024 20:56:41 +0200 Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote: > Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum > fuzz factor to 0") reduced the fuzz factor. > > Due to this change, paxtest fails to build with output: > > Applying 0001-genpaxtest-move-log-location.patch using patch: > patching file genpaxtest > Hunk #1 FAILED at 35. > 1 out of 1 hunk FAILED -- saving rejects to file genpaxtest.rej > > This commit refreshes the package patch on the current package version. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > package/paxtest/0001-genpaxtest-move-log-location.patch | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas
diff --git a/package/paxtest/0001-genpaxtest-move-log-location.patch b/package/paxtest/0001-genpaxtest-move-log-location.patch index 6447d53c96cc..fa18815d6da0 100644 --- a/package/paxtest/0001-genpaxtest-move-log-location.patch +++ b/package/paxtest/0001-genpaxtest-move-log-location.patch @@ -7,6 +7,8 @@ Move log location to /var/log instead of local directory. (For read-only filesystems) Signed-off-by: David Graziano <david.graziano@rockwellcollins.com> +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- genpaxtest | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) @@ -16,15 +18,14 @@ index 5a22e15..d62b15e 100644 --- a/genpaxtest +++ b/genpaxtest @@ -35,7 +35,7 @@ - exit 1 + exit 1 fi - + -LOG=\$HOME/paxtest.log +LOG=/var/log/paxtest.log [ -n "\$1" ] && LOG=\$1 touch "\$LOG" if [ ! -e "\$LOG" ]; then - -- 1.9.1
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, paxtest fails to build with output: Applying 0001-genpaxtest-move-log-location.patch using patch: patching file genpaxtest Hunk #1 FAILED at 35. 1 out of 1 hunk FAILED -- saving rejects to file genpaxtest.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- package/paxtest/0001-genpaxtest-move-log-location.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)