From patchwork Wed Jul 3 10:25:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3159 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E162B3F102 for ; Wed, 3 Jul 2024 12:25:09 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-57d3eca4c01sf2291371a12.0 for ; Wed, 03 Jul 2024 03:25:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720002309; cv=pass; d=google.com; s=arc-20160816; b=jAxj/uPgGw9BfwLyWanyrnGzFiSRYsnIg9AZwiq5upkD0zaZsXkZbq+hdN0YFwX7nQ qX3tvcVMibJKX3F07hhOI4J+F7o0dlbDu2d9SNM2RFF/8SDkWps80BS52yXL+CH0B68t lcxE2LmmkTwTBnnstTNnqn0aRXawo8g282GhMDBxEYzWmBhKSfeGefPtBgOw73SMitTt HYubaB0o49B9j6ZYjHll09uV8ZUXFgSWOvvgrj76yGCwTKkktOHJRkgi8lIHEprcdj4E Suu+aR05pS54ibFdR5oE3NPsFxnO3mri9gjGMglwvP09g5VOOPovYh8OcpvzUOKNsRdL ChmA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=IbFNlJWaVfk4d5UBFZ9SmwOPgmAXAAroC2vH5JY6m8o=; fh=yiGriLui6+vs3YdzYJB3NwuoYNmdgg6Rkp81G5niDc4=; b=UOghuvvoBwHbmQbFW9F+K5yzUx221h4xLkiviQBvhCNsym6sdbZmSaIJE/j5bzOoZV N98ZhiiWf/LWzb7ZUCxsw9psfjdz1VQXLYd9F2YaPCiAhdRXJKdVGnUfu2hVngl9NGxb zMN5EF9VvfFVZR+YypzQM5p9O5UWAKTy0KEWJgz5wQ2SEqHBSbEY0a9ZQyH6SO94e4ju /dlthu6VIPqhfZdTiJIFgr3ZZLxoFKVG18alnKNBYqYTLIwqm3sE2XDh3ERzlSQzqavU Bw18n0yXq9Zsuh0OUJNU+5z1AtBF9WouoGiHAqOY2r3Gis9JbkAshSFKPS7Tw+cBnX2Q jQug==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=rzXjucEL; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720002309; x=1720607109; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=IbFNlJWaVfk4d5UBFZ9SmwOPgmAXAAroC2vH5JY6m8o=; b=h1xw3/9Kbeqyk5MB+ryTOybjD5GxhOpCa5l88lzn5nqGIe220dWXPr1Rz8lBGzXYbC ws/erkaNivvGyNpTfLjcn7j3lXtTJ3nC+6IXMei2Ulm1iHZ9wz7LE287CHeReP8NipAY EhYF1kzjuXswngXkBOeKpq1E7z6SXuPcDknCo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720002309; x=1720607109; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=IbFNlJWaVfk4d5UBFZ9SmwOPgmAXAAroC2vH5JY6m8o=; b=mgHhmmUvQT4RbR3yixsQXKYiS6ypHR0pVcs4DGy6hciMdzZTjCQrr+Y2FC1DgXSv+t RUKJ0OTRmG7dn310qvtPorNYUhgHelU+UlgxM3JlxmMqWEX4h9yFdexdArEf0TaVfxHP 8aJ60oBd7wCCwsLsKVeHTTgg+gF7uDcNAGToqS7BAH9WlTQUUPmQi3TbQouO8rx9i+yX N9Ri9est7xaBxGJltpV8C7/pworQOT49wlQNfKiFKMYnPRYdjjlnS+H99s3C4Jz/T6j6 MGao91KCPBv8ICzVYe8btBQjz3drZFaVStU1JQhR+0hmCMRil1Ipg2wSZpLZ3nb2R6Hr vB9A== X-Forwarded-Encrypted: i=2; AJvYcCXEmszeR4YJ0DWp8yf56zkw98sthnW7BrQOOD1aJFPB5CgRZIiH+TW5y4Za/Iox6QY/psbDSuYljKSBKTm8hECl+dsf5zEttRLeGToQ7LjE5QegoqtQWK0XHquoyQ== X-Gm-Message-State: AOJu0YyWYX8UUSqGSnIO+Nw/5HYNCB3NNNAugp2Q+2wmIK17IdmmFXrT LywwBN3ouFhp3hBKwcnwFma5XZNDWQCp5Ic6+o5A3sHMjxBFiKKhsxL5xLyUae9tYg== X-Google-Smtp-Source: AGHT+IGwbORLriOzeudeJgfhGIImYlB6n/XcMLf0ugIDn/8wiCXdYkCEKRf33cnKdTf7JE8naslAZQ== X-Received: by 2002:a05:6402:26d4:b0:57c:6a71:e62e with SMTP id 4fb4d7f45d1cf-5879f9843cdmr6658031a12.23.1720002309295; Wed, 03 Jul 2024 03:25:09 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:d6c6:0:b0:58b:ea63:24e5 with SMTP id 4fb4d7f45d1cf-58bea6327a5ls845198a12.1.-pod-prod-02-eu; Wed, 03 Jul 2024 03:25:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuDOqQEATnW8ijE4o8WBajGxR0i0Pgrm6byPHudxmKs/rB5AI0becZPLSBxrYDQkaNajKSK7hUDgdRO918oUHn9uq2BCnklVN3WfrRxW9ytPj8 X-Received: by 2002:a17:906:a894:b0:a6f:f7c:5c7a with SMTP id a640c23a62f3a-a7514498b0fmr639465066b.67.1720002307711; Wed, 03 Jul 2024 03:25:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720002307; cv=none; d=google.com; s=arc-20160816; b=GMxbQHccXQPNATyTKXqZH4CAnFVI/MjOBHXYytMFM+ZEz1Cc7mGrzqWx1nqKnJ9BSA 31gJcio1/yAgU/UGJgz6DNmX9AU3P1Qj7kBc4zVcDAJlGu5DgLTeAoy9LhARxRkvY40L rJsKj75PRd/VAB/tjQK8gHQbTXr1sJR0wQ0sCs5v3OerRPk+oCAQHXwE9isgFNq3Jg6x jhEYU97wTx4RKqjzvfrQaG/R2ycky11bFTFm7x2kHluRIwdX66jvoshymkW+1Uy07jUY wH8BDDD7TwqSShQAneMXYJmUpM6JSEPv1rvUE6QiLFmubi7OXJ3KdEPOc1HSO7Wt7VGt kA6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=QY6dUH+huwHh+BMDNXTkU4EpkohuTI/SwUqxVLtZIMs=; fh=B8pFR/qojV38IxRrd0GQbs/BFXzl1OxAFCmO82eyNSE=; b=CgTiccPKenIaCC78PEID6GC+m1dHHODMlLNZ0WFEr+mLEBkUN6rmwjh0GRrLd624rr 2m5RuzPA3DBkepw0TYrIWHOvJruOL4rPOfyTv+yPQc886nCM3l1M5NIwyzDhdvZ4r6Ul o/z4ze8D5qua8dKU3RjecRg0ORxiMoxiwsS/9cqY3UaWbIFRq01V4/jyn8mqjZgMaZDK DqAWgGDcGVLH57X3AonhCSheSB4CvY7mb32Or3Sv7j7cdVlI/satl5SKSAbmvdQR14Ka lA0gIHQqvyJpeyKHpxw0bI+bLTleX/adfoG57Kxy+ACpt0kMkhz6wCZDP2my0jNStyNf QJGQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=rzXjucEL; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a729d7c121dsor400406166b.6.2024.07.03.03.25.07 for (Google Transport Security); Wed, 03 Jul 2024 03:25:07 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWEhnpqPLeo4PLmP/ztq+t/NzocFrUaSK757qjHPhnceRB8sC53JtkrvpP+87IrsJJljNGykOEqPrQO1GUzrB5q4aL2SCLKQX1y7d9ZOxqttYOX X-Received: by 2002:a17:906:4908:b0:a6f:adf7:b077 with SMTP id a640c23a62f3a-a751440e8e9mr631659566b.28.1720002307168; Wed, 03 Jul 2024 03:25:07 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:1a37:2bf3:7cf8:1941]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58614d507d2sm6788970a12.64.2024.07.03.03.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 03:25:06 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/lxc: update the patches to be applied with fuzz 0 Date: Wed, 3 Jul 2024 12:25:03 +0200 Message-ID: <20240703102503.2693749-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=rzXjucEL; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- ...-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 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 Upstream: https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- 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 +