From patchwork Wed May 22 07:02:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3112 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 19B263F9F8 for ; Wed, 22 May 2024 09:02:51 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a59aedbd9a9sf43088466b.0 for ; Wed, 22 May 2024 00:02:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361370; cv=pass; d=google.com; s=arc-20160816; b=Rb7k7jY+5lwNEQ+ok0KeGcUiREwBiM+dfV/Ah8uQEp9xSMGOuBSU8jvd0dahkXnSZV zmqwp5lhJb9QL95kxoUcgtFOqBYfDTzHPRZOWPf8RSJJsDYsTAfGSsZw3k0rpWYLOri1 CwUrlYWuKq3YAqnFsafRzd2ahvqwb2a+LwO3x0tb2MBo+gb1hXC8BZrw833IigCgQzFO uu5OjQFQAixkQoC9Bvr83pws8x17QoPPSELFPvKX8aYRskrhPaaeHhi5hTzRC9hIqm6y +v7shhr4No5yaUVFNbFKFr++P7/ECbFrc6gU4P3EwhaJidFD5Ec23oto3mKzhOpocvCR n8tw== 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:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XyCLaPZ4lykGGvAiXDPsk3jWZuou4dFOuqSFmHzXo7E=; fh=yZG0RhHXJdaMbQnYm6lZadh+2czcLaW+RfLHVQabyDc=; b=PbtvW9/d7EEYAP8n9oiwo0GOvLGnjH2K6e/jbp8mCUsdecZwO/eLckqM3DeayicBg4 WwjYvBLGI7IhvgUWFKPCPJp3ANlNbkYLsj7E07CI1GWkomU77gH+UlmasXR9XKLiGdKr PlapuI1FJunl67eLabUNG2McuAtNZrsoUZ+HYO2lP5xINTd27xOxs5yfpVY8OG08vd95 tdZQ3/0uyFcD3nki4faQ3xJqsEx/O9P9Q/BuP+HexYlDJ0egM462J+PQ/Ne0IWVHQ70X ODNiIT30OL67Q0Iyke3+d6WlgenFLR1FO4OxISXZt1ZL2gd5AZuaZ04Kv7Zm4um1xfrQ nKUQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aQAhkEyT; 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=1716361370; x=1716966170; 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:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=XyCLaPZ4lykGGvAiXDPsk3jWZuou4dFOuqSFmHzXo7E=; b=mGsN+qbxVgb9q8oWMz9sPJHw/XqI22gZlHF6UmPR3HP7BrmD+m59P0AzgzxgyMy6ge H+DQwgv0prp/wHi+vXSrb4HVQDL9Yj6WShJ4UVhEXrUcuQTTuyKmUhg0M0cyiPelO77P 6uEIzsvcmlrf4VU6ZVq5W+rp8VPQKF1MwXnes= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361370; x=1716966170; 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 :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XyCLaPZ4lykGGvAiXDPsk3jWZuou4dFOuqSFmHzXo7E=; b=M9D0zWlGCZ73PS7sqX9XyOZVtSOZDHaDg0iEdjx/5A3ws2/ojGoCKtsb3g8y+YfmHh 4R8rbynI+GvBs1D/PO8IZ/0hUkBqWVkBNh/UzLQpQ3uJDy3H2xWeBv5onqL6M1mumtDm 3vRiAW8TOplXnAn3OJCfEZSpAA2qsJVQfTfnRtA13yaijBI2rdlIKtOMt4AFJxcGREup kwabpWK/2gNW+BiIZjQhWgmpQMVrC8NhtZSGyJaZV/ZDt41u7DSDibxdV0bk473z98Ms yuqA/xr8GuUSTXx4XJQpSAFO7ON+YLs/l1Gjuua9XOkR8RibzJI0/17Opi7UscSekK6t dFyA== X-Forwarded-Encrypted: i=2; AJvYcCX7h0kbGdqFZapMNedf8jq15pTDpFITbv67hncpHNwBvr/p63suWO5m0nVMljlVJ6MddeVGOeaLLgBtdoqvNWXbKk6klo4DKJyZVXHQvZYcFDacwturqNM8rE+SpA== X-Gm-Message-State: AOJu0Yz05//hESW+ZSd1vMDDzBJlm61/UaDvmuYNrz/Je0C/KEPQI0jd LJIkW9f0XSS1vdK2cQgx+ktMjLkE7kwfuBntg54agonlpOxcKPhFiEwp2mDNSxCqgg== X-Google-Smtp-Source: AGHT+IFzIKBoIN7wOk7jkgykjagdBIJpioC4MlGjC46vtiSTgFZ8HgPqaAM8dw2RQok9WBWruJ49Hg== X-Received: by 2002:a50:a6dc:0:b0:572:9b20:2929 with SMTP id 4fb4d7f45d1cf-57832c4ec00mr534704a12.37.1716361370791; Wed, 22 May 2024 00:02:50 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:e88:b0:574:f233:f00d with SMTP id 4fb4d7f45d1cf-574f233fa23ls536158a12.0.-pod-prod-09-eu; Wed, 22 May 2024 00:02:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJfMneTEGtlMSzYF7j0AK7ZcsRFoVWqkhbAKB12IKnRqmqglRq45GiRsQdn2M6PTVo0nIOzqVW0SoMeqoq0jWsKj/KKqwYCBd1PAPPkGxOyBy/ X-Received: by 2002:a50:a682:0:b0:56e:60d:9b16 with SMTP id 4fb4d7f45d1cf-578329ecf39mr642081a12.6.1716361368977; Wed, 22 May 2024 00:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361368; cv=none; d=google.com; s=arc-20160816; b=BwyJH1b++bamO18rqwTFITm8Lphx/x+KVs90G/eBCgubUPZK/k9u26F79Ls/wt2JRa gEdrYV6vYbN2+55IAyrNHsBgdAtKzgqsDZojSo49awauH5m3d7xRxUtHy5NdZ9BlsPot Brhu8qyFgek1RF93UN2165jzVux+XbhwcgUpUaLspeT1ZLDWJTSFMpViUoanZHKXU/rC 9LWTvMgK3BjcZdnSpKF3q7biPyn6GE2n4vh81GIBFJSlrpODd9jzbR/vElj6Sq1uZSm/ 3T8kHyE5WJNUl/FmI/aza2apzlOBIbjGklLr2CG7b/8gcvug5gghjQSTYkUPpiFaD3uN TXvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XxOzfEtNFxb7Y2jjlOwycso6YiCuLv/lueVKvE9abck=; fh=eHE4QPj746gcA4h7isT1dOZF07voA3UiK9fL8QCOz2U=; b=OPtLxzZCsL+6rYaqeWIOBx/JMJdvEqhapP1O1R90o7C+WXOXgyJQSvtpxEF+FZkZF0 fhYV8JrSImtFd8RHV60SmOYT/mhSo9r3J9dtGMxhH1yt0a+P2uPVp72e+EX2T5LITsPB GD/oGhqCaaCkOe7Jffw5AwM3tMkYVwyDoqEGOWTtU1buHQP4hwM+aXA+pfq44big8sKI YSJgMaCZ025gFmCwzlsX3HRTBbk6+KRyIz73Z4IhQ/7u8rSsm22w5gAaeJZElxu9lInv YQrVFS+C0Oo84Pzsgnl0jkpPFxuIhhzl9/tl6Jw9TMuygUtfpGtcx3GQJx1PdeMasiBz OaMA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aQAhkEyT; 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 4fb4d7f45d1cf-575089a3e46sor3130201a12.1.2024.05.22.00.02.48 for (Google Transport Security); Wed, 22 May 2024 00:02:48 -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; AJvYcCVGYQABKpqZkuH26o7Gm7pWY/N9mUL9fg0IPIZodp/ddTC/cn8t9DuaGNo3BcSV0mzFVNSmzTd6haux8Yu0UcoGSUpiW6tpF85jVgHmtvt3svyy X-Received: by 2002:a50:d6c9:0:b0:575:17ce:adc3 with SMTP id 4fb4d7f45d1cf-57832a69e33mr568007a12.22.1716361368607; Wed, 22 May 2024 00:02:48 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:48 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 03/18] boot/syslinux: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:22 +0200 Message-ID: <20240522070238.3282121-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> 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=aQAhkEyT; 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: , This commit allows the syslinux patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../syslinux/0015-efi-main.c-include-efisetjmp.h.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch index 2fd61ecbc8fe..15adfc49f33c 100644 --- a/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch +++ b/boot/syslinux/0015-efi-main.c-include-efisetjmp.h.patch @@ -1,4 +1,4 @@ -From 7d68fa68cd9f2987bd85339f3391913a8b0e58c7 Mon Sep 17 00:00:00 2001 +From 26979f738518404b1d3dc9ecdcf4fa5811412c49 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 24 Mar 2020 10:21:27 +0100 Subject: [PATCH] efi/main.c: include @@ -38,13 +38,15 @@ This is due to gnu-efi commit 486ba3c3bdd147b7d98159b9e650be60bce0f027 So we act as specified, and include from efi/main.c. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Upstream: https://www.syslinux.org/archives/2020-March/026621.html --- efi/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/efi/main.c b/efi/main.c -index 6a748412..e924cfb1 100644 +index 71d31a5c1f13..7dc7bca7aeba 100644 --- a/efi/main.c +++ b/efi/main.c @@ -12,6 +12,7 @@ @@ -54,7 +56,7 @@ index 6a748412..e924cfb1 100644 +#include #include "fio.h" #include "version.h" - #include "efi_pxe.h" + -- -2.25.1 +2.43.0