From patchwork Wed Jul 3 19:12:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3164 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 5FFA73F102 for ; Wed, 3 Jul 2024 21:12:35 +0200 (CEST) Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-52e994d8e26sf938910e87.2 for ; Wed, 03 Jul 2024 12:12:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720033954; cv=pass; d=google.com; s=arc-20160816; b=ZBpR3N/LVDS8QEqXHMSMWY5Oli8xWbUQMl+GbZ+rRci8mXQ23nt37zIIS46RQ/NMy7 csuH30Lp4S0x//4SImrUQKc7dDkYo07U9LqDDzfuwqwMShTRD6UIfoGhqAKVXxz1wJBb gSJcnyYks4N0BFCmbKtCS1qTDAZsiNVa5wpbdfuZ1ygPP+vghUTtx44VhHWpEd6V+gCK yRSETRpVvZqrOk961849IsTxfObEnjO7aC5ledsseWPUGORrLLbO7RMxxQv7uGf2FDEr YZk3zq0nuSHorrVZ6/37XRAJLqF87+YB1xmk/atb5q6BtJDULxQclLYM8KjBQAjO4ByE JTFw== 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=Z4is09wpTZRdXKOWbjHu5id2OyPBeCe3TfSLI+YpqiE=; fh=exgkAagupHB0e26+TF8n0FOFcVEGXmjFei/J7cjkbIo=; b=zh3mofgc3YguxxUrnR76w1E3AlvDPgecSD9KWmKMU2UdQqP6mUQsmIgwFQPFYz2qqU FGTPVcBc62kwFta5x8cCXy8rTHaLhImVfNVxELXYk6IqUMQZLcUf0fco4q9xV2fS6teF 1VhPA1bWMuWE/jsHSMHqFhB4m0HAKVD9s7qCu33QQ2egDCSmI1xR3uWsxOBrMQQLpfmm C8AKcxx2KC8jnOMDC45Dlk1a9Oc2hgXyddkIHsb+uffjfrwsCUBi8KY3JwwGoLmLg4iz hc3zdYVJKtm24fNoQ9EBhNkh3TatsbsAjUnKIOtdq75pZUbQLvxV7So0JxbRqVLo+dSw wYQw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=QQoKpmKs; 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=1720033954; x=1720638754; 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=Z4is09wpTZRdXKOWbjHu5id2OyPBeCe3TfSLI+YpqiE=; b=AFMwRLVE4IeL7kW6kHeb9eEutgRX7VT/cHYXPgTZRf6mgzASUL37Tt4zdi+bW43JCp W6swF+Bmbf0QLWZm5O3LtxiWqqImxeV+5EQbkaf8j7bhIiZ0+Xj8/MlyIrPGPMNrEU9W RGfW/H6dI7M1iI7t9Mg1fXFePXll7t5qxMv+k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720033954; x=1720638754; 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=Z4is09wpTZRdXKOWbjHu5id2OyPBeCe3TfSLI+YpqiE=; b=J1O0iq9utx1esWUw2a2/2pjsVVJYOjFgQ6ULl6b5KcT/UiDadAIAm9qs+hFhM3yO8b nW9JnYRE1XRqFL0Al/TskG3+bPPAb/ao23bg2JLstACIlmx5VqtOvXNZuBO/Kd7uMIsT FFdJfBsQ+n+UX4uRJ1s2Ob7Kn4IfGPYk+Gi1m5cegbVM5TkO3WltxUO+CGCG1VYkPsZI Js7Dhm/i1GXdVoVoXlL8AyJUE9AMECtfpw6Th8pJvfuoDK5I+QkufulVcguhpgoo9INd ZTFrIKRuBZZ1vkHwx0daZpoS9m5IJp4tfugpERjrBDDQvX5ymaBS9MbRoSLUD9Y8NL1G YGRw== X-Forwarded-Encrypted: i=2; AJvYcCXllv08NB+SzqznK/Adc+NLx9zM7+u5T2Z8xP3gb8BOFdsL5tBtGplOFGoohXaXzX5GzQMx55oA/BXfuAttPQ8Bcf0lCz/vOcNwI942nfTfhMlOU3ZgeH5wt4O4Mg== X-Gm-Message-State: AOJu0Yw42utU6fldRqAO1x2g+vN4D+Tb/G/FJ3t1nfOgwo97YTSNDcq0 0cMH0togvbx1wE55Dm8e6EdKXMKai1qAOXZsCiKXnANn4VbIOO53ZvURtrNXENj3JQ== X-Google-Smtp-Source: AGHT+IH6H35bkSOiGPLQReXR7YHeAcoPGciMzL4aqhneOWucdC5yLVT8jnOIkWlhZ+fv1cc4B0AhLg== X-Received: by 2002:a05:6512:33ce:b0:52b:c1cc:51f1 with SMTP id 2adb3069b0e04-52e82677e7fmr8807135e87.23.1720033954496; Wed, 03 Jul 2024 12:12:34 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:ac2:5387:0:b0:52e:9bed:f9c4 with SMTP id 2adb3069b0e04-52e9bedfce2ls191246e87.0.-pod-prod-01-eu; Wed, 03 Jul 2024 12:12:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDNWU6+jzBCb13vu4ZXWl4yk/UibF+OJm/JWKTzV5nGvuyzfujXTxFY53nNGX/yCAD//CQZEnmfWKDQu0NFH1QKYjbcRMa14gO7mLvXQYAI4Sv X-Received: by 2002:a05:6512:1589:b0:52e:9d2c:1c81 with SMTP id 2adb3069b0e04-52e9d2c2094mr352783e87.13.1720033952664; Wed, 03 Jul 2024 12:12:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720033952; cv=none; d=google.com; s=arc-20160816; b=aWdPqUUpeb2yDg60qqvsrv5/Pv613pfDc2Na6GaQeZIriJSxRe0Hy+lg4i6j30uItA 3peZWT9hZh28B5z3/U/GoGbJNznUiTZG1kISbiPmXT80jFMCkEWKTfLEQMXdk9ruEwnM cz6D4HoD0weCtG6QsmfBvy+EN2quKqe1K5jAX7bh9VT8rxErdO98HmDS437VNznNVgPp eB649eJ4qcrLwQmDdqsxJBYjQ0ErTyq5AnOIuY/jx8j+JvQkM/RrxQpuYuqOyDzKKMPo t2tfRjmyOAJ5Dajb+iXbnJPRVGyhXctiQDPTKCOT5vNUKIm/YxtIC9Km9IxHudNP9X4i ThrQ== 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=8FE+gFesMHae5XCGcBuuUFMKjhn8BhqAcTEi14n8AXM=; fh=HYix+7Vwbnf6pVgHXdZ2bPY4PqP7KyUopBkxa3Ca4oM=; b=AKqZqPN1jnqu099PYMztOj4VcQZAgi3UMcYi/5m+0+SHQqQ4zfyTxOn1aP/q8pKjc9 Fs4t+Rz+Kbv2q7jJUqyF2Nz57OswRoAKBWUcCdvWE368osXlb/+/8Geh96Uq0OMDBfMI ZZVNZEsRjEfDSD5SnjfcSL1cmP9jLZbpAnCSFjDdQqVpPIkzRxDwGuT13ArYDqRry/4T b0sclBLrTOGTWHWihTNAHLEVYPkZG2KKS2T/1D094nOM6W+X3psBqdzrXOxOwsd7bwxx WXwblVakd3coHP47oLn9qVncFpo2RdE3ZP5lKis/Q/8plo8GWnwkQH6cLXRVBkMaEEF5 mtdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=QQoKpmKs; 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-a77af20ee5esor20216166b.11.2024.07.03.12.12.32 for (Google Transport Security); Wed, 03 Jul 2024 12:12:32 -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; AJvYcCV24jUOffR76DYNr8jNY4IhT9v4PczeG7Jb2Lu2fD5koFCaK4KH373AT4uw5Xwm1+THp2xykklXPIgaQI3nL0pbVNDu9DvP82ZIlYXq1pcFrJC9 X-Received: by 2002:a05:6402:354c:b0:57d:5c96:72aa with SMTP id 4fb4d7f45d1cf-5879be9a1a7mr10230387a12.0.1720033952046; Wed, 03 Jul 2024 12:12:32 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-58d0bfeec43sm1087032a12.48.2024.07.03.12.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 12:12:31 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: =?utf-8?b?SsOpcsO0bWUgUG91aWxsZXI=?= , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2] package/lxc: update the patches to be applied with fuzz 0 Date: Wed, 3 Jul 2024 21:12:28 +0200 Message-ID: <20240703191228.2799856-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=QQoKpmKs; 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. As you can see from [1], the patch was created for version v6.0.0 but has been backported in Buildroot without being rebased on lxc v5.0.0, where loongarch64 support was not yet merged. This is further evidence of the importance of applying patches with fuzz 0. [1] https://github.com/lxc/lxc/commit/82fe01821cd5cb8548598d7d93b07d6ef3f6b604 Signed-off-by: Dario Binacchi --- Changes v1 -> v2: - Improve commit message. ...-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 +