| Message ID | 20240703102503.2693749-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hello Dario, Le 03/07/2024 à 12:25, 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, lxc fails to build with output: > > Applying 0001-src-lxc-syscall_numbers.h-drop-define-1.patch using patch: > patching file src/lxc/syscall_numbers.h > Hunk #1 FAILED at 53. > Hunk #2 FAILED at 92. > Hunk #3 FAILED at 129. > Hunk #4 FAILED at 166. > Hunk #5 FAILED at 203. > Hunk #6 FAILED at 272. > Hunk #7 FAILED at 309. > Hunk #8 FAILED at 346. > Hunk #9 FAILED at 383. > Hunk #10 FAILED at 440. > Hunk #11 FAILED at 477. > Hunk #12 FAILED at 518. > Hunk #13 FAILED at 759. > 13 out of 13 hunks FAILED -- saving rejects to file src/lxc/syscall_numbers.h.rej > > This commit refreshes the package patch on the current package version. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > ...-lxc-syscall_numbers.h-drop-define-1.patch | 87 ++++++++++--------- > 1 file changed, 46 insertions(+), 41 deletions(-) > > diff --git a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch > index 4a944e35b12a..d6eb7476dc72 100644 > --- a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch > +++ b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch > @@ -1,4 +1,4 @@ > -From 82fe01821cd5cb8548598d7d93b07d6ef3f6b604 Mon Sep 17 00:00:00 2001 > +From 964740d28c9a0da52a75d579d7fdfa53df67e925 Mon Sep 17 00:00:00 2001 > From: Fabrice Fontaine <fontaine.fabrice@gmail.com> > Date: Sat, 30 Mar 2024 16:50:46 +0100 > Subject: [PATCH] src/lxc/syscall_numbers.h: drop define -1 > @@ -19,115 +19,120 @@ Fixes: > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > Upstream: https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 > +[Dario: make the patch to be applied with fuzz factor 0] > +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > src/lxc/syscall_numbers.h | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h > -index 58840a5981..5e659d1b81 100644 > +index ae5fdd0641c6..5dc1259fef1c 100644 > --- a/src/lxc/syscall_numbers.h > +++ b/src/lxc/syscall_numbers.h > -@@ -53,7 +53,6 @@ > - #elif defined __loongarch64 > - #define __NR_keyctl 219 > +@@ -51,7 +51,6 @@ > + #define __NR_keyctl 5241 > + #endif This hunk update looks strange due to __NR_keyctl value changes. It seems the patch has been backported directly from lxc v6.0.0 without being rebased on lxc v5.0.0 where loongarch64 support was not yet merged. I guess, it's the main reason of patch issue. Can you explain this in the commit log? Thanks for all the work around fuzz-0 changes! Best regards, Romain > #else > - #define -1 > #warning "__NR_keyctl not defined for your architecture" > #endif > #endif > -@@ -92,7 +91,6 @@ > - #elif defined __loongarch64 > - #define __NR_memfd_create 279 > +@@ -88,7 +87,6 @@ > + #define __NR_memfd_create 5314 > + #endif > #else > - #define -1 > #warning "__NR_memfd_create not defined for your architecture" > #endif > #endif > -@@ -129,7 +127,6 @@ > - #elif defined __loongarch64 > - #define __NR_pivot_root 41 > +@@ -123,7 +121,6 @@ > + #define __NR_pivot_root 5151 > + #endif > #else > - #define -1 > #warning "__NR_pivot_root not defined for your architecture" > #endif > #endif > -@@ -166,7 +163,6 @@ > - #elif defined __loongarch64 > - #define __NR_setns 268 > +@@ -158,7 +155,6 @@ > + #define __NR_setns 5303 > + #endif > #else > - #define -1 > #warning "__NR_setns not defined for your architecture" > #endif > #endif > -@@ -203,7 +199,6 @@ > - #elif defined __loongarch64 > - #define __NR_sethostname 161 > +@@ -193,7 +189,6 @@ > + #define __NR_sethostname 5165 > + #endif > #else > - #define -1 > #warning "__NR_sethostname not defined for your architecture" > #endif > #endif > -@@ -272,7 +267,6 @@ > - #elif defined __loongarch64 > - #define __NR_signalfd4 74 > +@@ -260,7 +255,6 @@ > + #define __NR_signalfd4 5283 > + #endif > #else > - #define -1 > #warning "__NR_signalfd4 not defined for your architecture" > #endif > #endif > -@@ -309,7 +303,6 @@ > - #elif defined __loongarch64 > - #define __NR_unshare 97 > +@@ -295,7 +289,6 @@ > + #define __NR_unshare 5262 > + #endif > #else > - #define -1 > #warning "__NR_unshare not defined for your architecture" > #endif > #endif > -@@ -346,7 +339,6 @@ > - #elif defined __loongarch64 > - #define __NR_bpf 280 > +@@ -330,7 +323,6 @@ > + #define __NR_bpf 5315 > + #endif > #else > - #define -1 > #warning "__NR_bpf not defined for your architecture" > #endif > #endif > -@@ -383,7 +375,6 @@ > - #elif defined __loongarch64 > - #define __NR_faccessat 48 > +@@ -365,7 +357,6 @@ > + #define __NR_faccessat 5259 > + #endif > #else > - #define -1 > #warning "__NR_faccessat not defined for your architecture" > #endif > #endif > -@@ -440,7 +431,6 @@ > - #elif defined __loongarch64 > - #define __NR_seccomp 277 > +@@ -420,7 +411,6 @@ > + #define __NR_seccomp 5312 > + #endif > #else > - #define -1 > #warning "__NR_seccomp not defined for your architecture" > #endif > #endif > -@@ -477,7 +467,6 @@ > - #elif defined __loongarch64 > - #define __NR_gettid 178 > +@@ -455,7 +445,6 @@ > + #define __NR_gettid 5178 > + #endif > #else > - #define -1 > #warning "__NR_gettid not defined for your architecture" > #endif > #endif > -@@ -518,7 +507,6 @@ > - #elif defined __loongarch64 > - #define __NR_execveat 281 > +@@ -494,7 +483,6 @@ > + #define __NR_execveat 5316 > + #endif > #else > - #define -1 > #warning "__NR_execveat not defined for your architecture" > #endif > #endif > -@@ -759,7 +747,6 @@ > - #elif defined __loongarch64 > - #define __NR_personality 92 > +@@ -733,7 +721,6 @@ > + #define __NR_personality (132 + 5000) > + #endif > #else > - #define -1 > #warning "__NR_personality not defined for your architecture" > #endif > #endif > +-- > +2.43.0 > + To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.
diff --git a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch index 4a944e35b12a..d6eb7476dc72 100644 --- a/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch +++ b/package/lxc/0001-src-lxc-syscall_numbers.h-drop-define-1.patch @@ -1,4 +1,4 @@ -From 82fe01821cd5cb8548598d7d93b07d6ef3f6b604 Mon Sep 17 00:00:00 2001 +From 964740d28c9a0da52a75d579d7fdfa53df67e925 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine <fontaine.fabrice@gmail.com> Date: Sat, 30 Mar 2024 16:50:46 +0100 Subject: [PATCH] src/lxc/syscall_numbers.h: drop define -1 @@ -19,115 +19,120 @@ Fixes: Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Upstream: https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- src/lxc/syscall_numbers.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h -index 58840a5981..5e659d1b81 100644 +index ae5fdd0641c6..5dc1259fef1c 100644 --- a/src/lxc/syscall_numbers.h +++ b/src/lxc/syscall_numbers.h -@@ -53,7 +53,6 @@ - #elif defined __loongarch64 - #define __NR_keyctl 219 +@@ -51,7 +51,6 @@ + #define __NR_keyctl 5241 + #endif #else - #define -1 #warning "__NR_keyctl not defined for your architecture" #endif #endif -@@ -92,7 +91,6 @@ - #elif defined __loongarch64 - #define __NR_memfd_create 279 +@@ -88,7 +87,6 @@ + #define __NR_memfd_create 5314 + #endif #else - #define -1 #warning "__NR_memfd_create not defined for your architecture" #endif #endif -@@ -129,7 +127,6 @@ - #elif defined __loongarch64 - #define __NR_pivot_root 41 +@@ -123,7 +121,6 @@ + #define __NR_pivot_root 5151 + #endif #else - #define -1 #warning "__NR_pivot_root not defined for your architecture" #endif #endif -@@ -166,7 +163,6 @@ - #elif defined __loongarch64 - #define __NR_setns 268 +@@ -158,7 +155,6 @@ + #define __NR_setns 5303 + #endif #else - #define -1 #warning "__NR_setns not defined for your architecture" #endif #endif -@@ -203,7 +199,6 @@ - #elif defined __loongarch64 - #define __NR_sethostname 161 +@@ -193,7 +189,6 @@ + #define __NR_sethostname 5165 + #endif #else - #define -1 #warning "__NR_sethostname not defined for your architecture" #endif #endif -@@ -272,7 +267,6 @@ - #elif defined __loongarch64 - #define __NR_signalfd4 74 +@@ -260,7 +255,6 @@ + #define __NR_signalfd4 5283 + #endif #else - #define -1 #warning "__NR_signalfd4 not defined for your architecture" #endif #endif -@@ -309,7 +303,6 @@ - #elif defined __loongarch64 - #define __NR_unshare 97 +@@ -295,7 +289,6 @@ + #define __NR_unshare 5262 + #endif #else - #define -1 #warning "__NR_unshare not defined for your architecture" #endif #endif -@@ -346,7 +339,6 @@ - #elif defined __loongarch64 - #define __NR_bpf 280 +@@ -330,7 +323,6 @@ + #define __NR_bpf 5315 + #endif #else - #define -1 #warning "__NR_bpf not defined for your architecture" #endif #endif -@@ -383,7 +375,6 @@ - #elif defined __loongarch64 - #define __NR_faccessat 48 +@@ -365,7 +357,6 @@ + #define __NR_faccessat 5259 + #endif #else - #define -1 #warning "__NR_faccessat not defined for your architecture" #endif #endif -@@ -440,7 +431,6 @@ - #elif defined __loongarch64 - #define __NR_seccomp 277 +@@ -420,7 +411,6 @@ + #define __NR_seccomp 5312 + #endif #else - #define -1 #warning "__NR_seccomp not defined for your architecture" #endif #endif -@@ -477,7 +467,6 @@ - #elif defined __loongarch64 - #define __NR_gettid 178 +@@ -455,7 +445,6 @@ + #define __NR_gettid 5178 + #endif #else - #define -1 #warning "__NR_gettid not defined for your architecture" #endif #endif -@@ -518,7 +507,6 @@ - #elif defined __loongarch64 - #define __NR_execveat 281 +@@ -494,7 +483,6 @@ + #define __NR_execveat 5316 + #endif #else - #define -1 #warning "__NR_execveat not defined for your architecture" #endif #endif -@@ -759,7 +747,6 @@ - #elif defined __loongarch64 - #define __NR_personality 92 +@@ -733,7 +721,6 @@ + #define __NR_personality (132 + 5000) + #endif #else - #define -1 #warning "__NR_personality not defined for your architecture" #endif #endif +-- +2.43.0 +
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, lxc fails to build with output: Applying 0001-src-lxc-syscall_numbers.h-drop-define-1.patch using patch: patching file src/lxc/syscall_numbers.h Hunk #1 FAILED at 53. Hunk #2 FAILED at 92. Hunk #3 FAILED at 129. Hunk #4 FAILED at 166. Hunk #5 FAILED at 203. Hunk #6 FAILED at 272. Hunk #7 FAILED at 309. Hunk #8 FAILED at 346. Hunk #9 FAILED at 383. Hunk #10 FAILED at 440. Hunk #11 FAILED at 477. Hunk #12 FAILED at 518. Hunk #13 FAILED at 759. 13 out of 13 hunks FAILED -- saving rejects to file src/lxc/syscall_numbers.h.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- ...-lxc-syscall_numbers.h-drop-define-1.patch | 87 ++++++++++--------- 1 file changed, 46 insertions(+), 41 deletions(-)